From f0fbfdd1b4e438354f0eed6f75497d2315658211 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@google.com>
Date: Tue, 28 Apr 2020 17:44:32 -0700
Subject: [PATCH] boot: Relax getSnapshotMergeStatus test.

The SNAPSHOTTED state is allowed to be NONE if the slot hasn't changed,
to avoid needing extra snapshot cancels in the bootloader.

Bug: 154449745
Test: vts
Change-Id: Ibcb9f18f535cdcb5aae7e2c9c01e03681dbfff13
---
 boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp b/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp
index 7c58ef3717..30b965ddbb 100644
--- a/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp
+++ b/boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp
@@ -76,7 +76,11 @@ TEST_P(BootHidlTest, SetSnapshotMergeStatus) {
     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);
+        }
     }
 }