commit d4c2e5d8a5af6836f39c709aa246328035711186
author Janis Danisevskis <jdanis@google.com> Thu Jun 08 01:55:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 08 01:55:37 2017 +0000
tree e551c0eed17764b660d6f1a7dd6289142d13d00d
parent 15ec48374b2d6a79e56ffcc12d580838a602dec0
parent 538b7d85ef1d9d655587917c744646461f02d8c8

Fix expected attestation version.
am: 538b7d85ef

Change-Id: I5ba0326f7e2f1547a1e08c2f44055a8938414ae4

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

diff --git a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
index 12bfac5..54c5ad5 100644
--- a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -925,11 +925,7 @@
                                        &att_tee_enforced,                //
                                        &att_unique_id));
 
-    if (att_keymaster_version == 3) {
-        EXPECT_EQ(2U, att_attestation_version);
-    } else {
-        EXPECT_EQ(1U, att_attestation_version);
-    }
+    EXPECT_TRUE(att_attestation_version == 1 || att_attestation_version == 2);
 
     expected_sw_enforced.push_back(TAG_ATTESTATION_APPLICATION_ID,
                                    HidlBuf(app_id));