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
This commit is contained in:
David Anderson
2020-04-28 17:44:32 -07:00
parent 1c4905c2ee
commit f0fbfdd1b4

View File

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