commit 75bea4b6dcdac7840207c33ddace1adac084950b
author David Zeuthen <zeuthen@google.com> Wed Apr 29 23:41:41 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 29 23:41:41 2020 +0000
tree e02a24262af93884867d777110f15e7b9a5db1db
parent f32d41bd11e23d0acd5e811908cc497f825e7797
parent 28edb103343576455941f39865a587d346476e65

Merge "Identity Credential: Pass additional information to HAL."

MODULE_LICENSE_APACHE2

diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null

boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp

diff --git a/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp b/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp
index 7c58ef3..30b965d 100644
--- a/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp
+++ b/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp
@@ -76,7 +76,11 @@
     for (const auto value : ValidMergeStatusValues()) {
         EXPECT_TRUE(boot->setSnapshotMergeStatus(value).withDefault(false));
         auto status = boot->getSnapshotMergeStatus();
-        EXPECT_EQ(status, value);
+        if (value == MergeStatus::SNAPSHOTTED) {
+            EXPECT_TRUE(status == MergeStatus::SNAPSHOTTED || status == MergeStatus::NONE);
+        } else {
+            EXPECT_EQ(status, value);
+        }
     }
 }