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

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

libsnapshot: Disable another legacy merge path in tests. 

Bug: 279009697
Test: presubmit
Change-Id: I1954b38f497bb8e4f7aa288e80541ac9ad5c075c
parent 2e998a43

fs_mgr/libsnapshot/snapshot_test.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2646,6 +2646,11 @@ TEST_F(SnapshotUpdateTest, QueryStatusError) { 
    ASSERT_TRUE(init->InitiateMerge());

    ASSERT_EQ(UpdateState::MergeFailed, init->ProcessUpdateState());



    if (ShouldSkipLegacyMerging()) {

        LOG(INFO) << "Skipping legacy merge in test";

        return;

    }



    // Simulate a reboot that tries the merge again, with the non-failing dm.

    ASSERT_TRUE(UnmapAll());

    init = NewManagerForFirstStageMount("_b");