ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Akilesh Kailash 2023-12-13 00:25:30 +00:00 • committed by Gerrit Code Review
commit d1d9b0ef8a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -2362,8 +2362,10 @@ TEST_F(SnapshotUpdateTest, AddPartition) {
auto init = NewManagerForFirstStageMount("_b");
ASSERT_NE(init, nullptr);
ASSERT_TRUE(init->EnsureSnapuserdConnected());
init->set_use_first_stage_snapuserd(true);
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,9 +2376,11 @@ TEST_F(SnapshotUpdateTest, AddPartition) {
ASSERT_TRUE(IsPartitionUnchanged(name));
}
ASSERT_TRUE(init->PerformInitTransition(SnapshotManager::InitTransition::SECOND_STAGE));
for (const auto& name : partitions) {
ASSERT_TRUE(init->snapuserd_client()->WaitForDeviceDelete(name + "-user-cow-init"));
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.