libsnapshot: fix tests
- Add TestDeviceInfo(string, string) to avoid holding
the 'rebooted' TestDeviceInfo variable after ownership is
transferred
- OTA client calls BeginUpdate after unmapping partitions.
Test: run libsnapshot_test
Change-Id: Id37e34b421d728eb320c0e0906abef3b61897e7c
diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp
index bc764fd..c7b2b4c 100644
--- a/fs_mgr/libsnapshot/snapshot_test.cpp
+++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -513,10 +513,7 @@
ASSERT_TRUE(sm->FinishedSnapshotWrites());
ASSERT_TRUE(DestroyLogicalPartition("test_partition_b-base"));
- auto rebooted = new TestDeviceInfo(fake_super);
- rebooted->set_slot_suffix("_b");
-
- auto init = SnapshotManager::NewForFirstStageMount(rebooted);
+ auto init = SnapshotManager::NewForFirstStageMount(new TestDeviceInfo(fake_super, "_b"));
ASSERT_NE(init, nullptr);
ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());
ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super"));
@@ -559,10 +556,7 @@
FormatFakeSuper();
ASSERT_TRUE(CreatePartition("test_partition_b", kDeviceSize));
- auto rebooted = new TestDeviceInfo(fake_super);
- rebooted->set_slot_suffix("_b");
-
- auto init = SnapshotManager::NewForFirstStageMount(rebooted);
+ auto init = SnapshotManager::NewForFirstStageMount(new TestDeviceInfo(fake_super, "_b"));
ASSERT_NE(init, nullptr);
ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());
ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super"));
@@ -603,10 +597,7 @@
ASSERT_TRUE(sm->FinishedSnapshotWrites());
ASSERT_TRUE(DestroyLogicalPartition("test_partition_b-base"));
- auto rebooted = new TestDeviceInfo(fake_super);
- rebooted->set_slot_suffix("_b");
-
- auto init = SnapshotManager::NewForFirstStageMount(rebooted);
+ auto init = SnapshotManager::NewForFirstStageMount(new TestDeviceInfo(fake_super, "_b"));
ASSERT_NE(init, nullptr);
ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());
ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super"));
@@ -761,9 +752,6 @@
// Also test UnmapUpdateSnapshot unmaps everything.
// Also test first stage mount and merge after this.
TEST_F(SnapshotUpdateTest, FullUpdateFlow) {
- // OTA client calls BeginUpdate before doing anything.
- ASSERT_TRUE(sm->BeginUpdate());
-
// OTA client blindly unmaps all partitions that are possibly mapped.
for (const auto& name : {"sys_b", "vnd_b", "prd_b"}) {
ASSERT_TRUE(sm->UnmapUpdateSnapshot(name));
@@ -774,6 +762,8 @@
SetSize(vnd_, 4_MiB);
SetSize(prd_, 4_MiB);
+ // Execute the update.
+ ASSERT_TRUE(sm->BeginUpdate());
ASSERT_TRUE(sm->CreateUpdateSnapshots(manifest_));
// Test that partitions prioritize using space in super.
@@ -812,9 +802,7 @@
ASSERT_TRUE(UnmapAll());
// After reboot, init does first stage mount.
- auto rebooted = new TestDeviceInfo(fake_super);
- rebooted->set_slot_suffix("_b");
- auto init = SnapshotManager::NewForFirstStageMount(rebooted);
+ auto init = SnapshotManager::NewForFirstStageMount(new TestDeviceInfo(fake_super, "_b"));
ASSERT_NE(init, nullptr);
ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());
ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super"));
@@ -965,9 +953,7 @@
ASSERT_TRUE(UnmapAll());
// After reboot, init does first stage mount.
- auto rebooted = new TestDeviceInfo(fake_super);
- rebooted->set_slot_suffix("_b");
- auto init = SnapshotManager::NewForFirstStageMount(rebooted);
+ auto init = SnapshotManager::NewForFirstStageMount(new TestDeviceInfo(fake_super, "_b"));
ASSERT_NE(init, nullptr);
ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());
ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super"));
@@ -979,9 +965,7 @@
// Simulate shutting down the device again.
ASSERT_TRUE(UnmapAll());
- rebooted = new TestDeviceInfo(fake_super);
- rebooted->set_slot_suffix("_a");
- init = SnapshotManager::NewForFirstStageMount(rebooted);
+ init = SnapshotManager::NewForFirstStageMount(new TestDeviceInfo(fake_super, "_a"));
ASSERT_NE(init, nullptr);
ASSERT_FALSE(init->NeedSnapshotsInFirstStageMount());
ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super"));
diff --git a/fs_mgr/libsnapshot/test_helpers.h b/fs_mgr/libsnapshot/test_helpers.h
index 0303a14..0814c03 100644
--- a/fs_mgr/libsnapshot/test_helpers.h
+++ b/fs_mgr/libsnapshot/test_helpers.h
@@ -52,6 +52,10 @@
public:
TestDeviceInfo() {}
explicit TestDeviceInfo(const std::string& fake_super) { set_fake_super(fake_super); }
+ TestDeviceInfo(const std::string& fake_super, const std::string& slot_suffix)
+ : TestDeviceInfo(fake_super) {
+ set_slot_suffix(slot_suffix);
+ }
std::string GetGsidDir() const override { return "ota/test"s; }
std::string GetMetadataDir() const override { return "/metadata/ota/test"s; }
std::string GetSlotSuffix() const override { return slot_suffix_; }