Merge pull request !2279 from xuqian0131/fixTdd
This commit is contained in:
openharmony_ci 2024-11-16 14:19:24 +00:00 committed by Gitee
commit fffe622dd7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 14 additions and 2 deletions

View File

@ -982,7 +982,13 @@ HWTEST_F(OsAccountManagerServiceModuleTest, OsAccountManagerServiceModuleTest054
OsAccountInfo osAccountInfoTwo; OsAccountInfo osAccountInfoTwo;
EXPECT_EQ(osAccountManagerService_->QueryOsAccountById(osAccountInfoOne.GetLocalId(), osAccountInfoTwo), ERR_OK); EXPECT_EQ(osAccountManagerService_->QueryOsAccountById(osAccountInfoOne.GetLocalId(), osAccountInfoTwo), ERR_OK);
EXPECT_EQ(isVerified, osAccountInfoTwo.GetIsVerified()); EXPECT_EQ(isVerified, osAccountInfoTwo.GetIsVerified());
ErrCode ret = osAccountManagerService_->RemoveOsAccount(osAccountInfoOne.GetLocalId());
if (ret == ERR_OSACCOUNT_SERVICE_INNER_ACCOUNT_OPERATING_ERROR) {
sleep(1);
EXPECT_EQ(osAccountManagerService_->RemoveOsAccount(osAccountInfoOne.GetLocalId()), ERR_OK); EXPECT_EQ(osAccountManagerService_->RemoveOsAccount(osAccountInfoOne.GetLocalId()), ERR_OK);
} else {
EXPECT_EQ(ret, ERR_OK);
}
} }
#endif // ENABLE_MULTIPLE_OS_ACCOUNTS #endif // ENABLE_MULTIPLE_OS_ACCOUNTS

View File

@ -779,7 +779,13 @@ HWTEST_F(OsAccountInnerAccmgrMockTest, SetOsAccountIsVerified001, TestSize.Level
EXPECT_EQ(ERR_OK, innerMgrService_->GetOsAccountInfoById(id, accountInfoAfter)); EXPECT_EQ(ERR_OK, innerMgrService_->GetOsAccountInfoById(id, accountInfoAfter));
EXPECT_TRUE(accountInfoAfter.GetIsVerified()); EXPECT_TRUE(accountInfoAfter.GetIsVerified());
ErrCode ret = innerMgrService_->RemoveOsAccount(createInfo.GetLocalId());
if (ret == ERR_OSACCOUNT_SERVICE_INNER_ACCOUNT_OPERATING_ERROR) {
sleep(1);
EXPECT_EQ(ERR_OK, innerMgrService_->RemoveOsAccount(createInfo.GetLocalId())); EXPECT_EQ(ERR_OK, innerMgrService_->RemoveOsAccount(createInfo.GetLocalId()));
} else {
EXPECT_EQ(ret, ERR_OK);
}
} }
/* /*