diff options
| author | David Anderson <dvander@google.com> | 2020-04-29 21:24:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-29 21:24:02 +0000 |
| commit | 5e77ed60155d5e57c830ff87954f3d81d96f4906 (patch) | |
| tree | 3983430cba110ce9bbd95baee653c0dbcf96a092 | |
| parent | e5f735df7d0094842e0c5ff00eabc812bee90ca2 (diff) | |
| parent | f2a0c5be2b575365ac10bb675f92768122b9f526 (diff) | |
Merge "boot: Relax getSnapshotMergeStatus test." am: f32d41bd11 am: f2a0c5be2b
Change-Id: I8532e12351470e1aa5fc8ea3d0578f9112610ba9
| -rw-r--r-- | boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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); + } } } |