aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@google.com>2019-08-02 22:38:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-02 22:38:07 -0700
commit39201d9d86303502944186db92c36e2428e15524 (patch)
tree38eec5403ca9f05f178eab0446932356533f6c04
parent493cc0cbfbad9dfeef604917bd39884565954c67 (diff)
parent363e8dad5d1109d1e88f35d23e627ea7cce521b5 (diff)
downloadsystem-test-harness-39201d9d86303502944186db92c36e2428e15524.tar.gz
Merge remote-tracking branch 'goog/upstream-master' into bill-nos-merge
am: 363e8dad5d Change-Id: If04063dd4b8220888bb227b2404aecbb284a52d1
-rw-r--r--src/faceauth_tests.cc17
1 files changed, 0 insertions, 17 deletions
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 @@ TEST_F(FaceAuthTest, ZeroChallengeShouldError) {
.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 @@ TEST_F(FaceAuthTest, InvalidChallengeShouldError) {
.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 @@ TEST_F(FaceAuthTest, ValidUserIDCheck) {
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),