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

Commit 5cca47da authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: skip connecting to daemon for legacy VAB" into main am:... 

Merge "libsnapshot: skip connecting to daemon for legacy VAB" into main am: d1d9b0ef am: 2ee52627

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2871223



Change-Id: Id57eab22cc3a0a3dc251ee9464fbedca2e75e0d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd04b7be 2ee52627

fs_mgr/libsnapshot/snapshot_test.cpp

+9 −5
Original line number Diff line number Diff line
@@ -2362,8 +2362,10 @@ TEST_F(SnapshotUpdateTest, AddPartition) { 
    auto init = NewManagerForFirstStageMount("_b");

    ASSERT_NE(init, nullptr);



    if (snapuserd_required_) {

        ASSERT_TRUE(init->EnsureSnapuserdConnected());

        init->set_use_first_stage_snapuserd(true);

    }



    ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());

    ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super", snapshot_timeout_));
@@ -2374,10 +2376,12 @@ TEST_F(SnapshotUpdateTest, AddPartition) { 
        ASSERT_TRUE(IsPartitionUnchanged(name));

    }



    if (snapuserd_required_) {

        ASSERT_TRUE(init->PerformInitTransition(SnapshotManager::InitTransition::SECOND_STAGE));

        for (const auto& name : partitions) {

            ASSERT_TRUE(init->snapuserd_client()->WaitForDeviceDelete(name + "-user-cow-init"));

        }

    }



    // Initiate the merge and wait for it to be completed.

    if (ShouldSkipLegacyMerging()) {