Merge remote-tracking branch 'goog/upstream-master' into bill-nos-merge
* goog/upstream-master:
faceauth_tests: no longer check HAT for ResetLockout if user not locked out
Bug: 138660660
Test: bazel, release tests
Change-Id: I87495f9de1c8c9abd078f684f0b6cada467473f0
diff --git a/src/faceauth_tests.cc b/src/faceauth_tests.cc
index 41aefcc..14a01cb 100644
--- a/src/faceauth_tests.cc
+++ b/src/faceauth_tests.cc
@@ -463,12 +463,6 @@
.Run()
.GetResult(),
Result(FACEAUTH_ERR_INVALID_CHALLENGE));
- EXPECT_REQ(Transaction(Task(PROFILE_1, FACEAUTH_CMD_RESET_LOCKOUT),
- Embedding(EMBEDDING_VECTOR_1, 1), Token())
- .Finalize()
- .Run()
- .GetResult(),
- Result(FACEAUTH_ERR_INVALID_CHALLENGE));
}
TEST_F(FaceAuthTest, InvalidChallengeShouldError) {
@@ -494,12 +488,6 @@
.Run()
.GetResult(),
Result(FACEAUTH_ERR_INVALID_CHALLENGE));
- EXPECT_REQ(Transaction(Task(PROFILE_1, FACEAUTH_CMD_RESET_LOCKOUT),
- Embedding(EMBEDDING_VECTOR_1, 1), Token(rand(), 0, 0))
- .Finalize()
- .Run()
- .GetResult(),
- Result(FACEAUTH_ERR_INVALID_CHALLENGE));
}
TEST_F(FaceAuthTest, EmbeddingCRCErrorShouldBeDetected) {
@@ -835,11 +823,6 @@
Result enroll_result = user1.Enroll(PROFILE_1);
EXPECT_REQ(enroll_result,
Result(FACEAUTH_SUCCESS).SetChallenge(user1.GetAuthID()));
-
- /* Reset Lockout User ID Check */
- EXPECT_REQ(user1.ResetLockout(PROFILE_1), Result(FACEAUTH_SUCCESS));
- EXPECT_REQ(user2.ResetLockout(PROFILE_1),
- Result(FACEAUTH_ERR_INVALID_USER_ID));
/* Set Feature User ID Check */
EXPECT_REQ(user1.SetFeature(PROFILE_1, 0), Result(FACEAUTH_SUCCESS));
EXPECT_REQ(user2.SetFeature(PROFILE_1, 0),
