| commit | e12394e149e5450572e54c30641b2b892ae68ada | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Fri Dec 03 20:46:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 03 20:46:47 2021 +0000 |
| tree | 2c2efed8860c3a70e7257fe58c19ce1b0bd3c665 | |
| parent | ac6a9b802df83f913f9f4f4c134f9da20e2f6018 [diff] | |
| parent | 6dadfad7a66aab38d0cce47caea4f918ad84276e [diff] |
Merge "libsnapshot: Fix test failure in CancelOnTargetSlot." am: f7da22dfe5 am: 6dadfad7a6 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1909831 Change-Id: Ib29082c2d259f29b75e58739bca6fa99178cef8b
diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp index f1d76e7..c3b2f78 100644 --- a/fs_mgr/libsnapshot/snapshot_test.cpp +++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -2215,6 +2215,8 @@ TEST_F(SnapshotUpdateTest, CancelOnTargetSlot) { AddOperationForPartitions(); + ASSERT_TRUE(UnmapAll()); + // Execute the update from B->A. test_device->set_slot_suffix("_b"); ASSERT_TRUE(sm->BeginUpdate());