Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0fbfdd1 authored by David Anderson's avatar David Anderson
Browse files

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
parent 1c4905c2

boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -76,9 +76,13 @@ TEST_P(BootHidlTest, SetSnapshotMergeStatus) { 
    for (const auto value : ValidMergeStatusValues()) {

    for (const auto value : ValidMergeStatusValues()) {

        EXPECT_TRUE(boot->setSnapshotMergeStatus(value).withDefault(false));

        EXPECT_TRUE(boot->setSnapshotMergeStatus(value).withDefault(false));

        auto status = boot->getSnapshotMergeStatus();

        auto status = boot->getSnapshotMergeStatus();

        if (value == MergeStatus::SNAPSHOTTED) {

            EXPECT_TRUE(status == MergeStatus::SNAPSHOTTED || status == MergeStatus::NONE);

        } else {

            EXPECT_EQ(status, value);

            EXPECT_EQ(status, value);

        }

        }

    }

    }

}





INSTANTIATE_TEST_SUITE_P(

INSTANTIATE_TEST_SUITE_P(

        PerInstance, BootHidlTest,

        PerInstance, BootHidlTest,