commit e67a810cc020df4ddc2ff960ad8e569d1de4607f
author David Anderson <dvander@google.com> Fri May 01 01:58:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 01 01:58:52 2020 +0000
tree 1f8be34f187a632ca3b191d861f990994a584d45
parent c4c9da2f0b929ab91435cb6e40d175d6484c428d
parent 3dd52813519561483f2c29496e573d5bc43bcd64

Merge "boot: Relax getSnapshotMergeStatus test." into rvc-dev

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);
+        }
     }
 }