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

Change-Id: I36426965beb8d103adc26043a1647b372a1ead1a
This commit is contained in:
David Anderson
2020-05-01 02:05:22 +00:00
committed by Automerger Merge Worker

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