Merge "boot: Relax getSnapshotMergeStatus test." am: f32d41bd11 am: f2a0c5be2b am: 5e77ed6015

Change-Id: I71aefe5e491c31e78d90f50f4768986fb8fd0c35
This commit is contained in:
David Anderson
2020-04-29 21:36:17 +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);
}
}
}