commit b7ee4eb9b0f295e1aa1ebda9fc5b9ec430b0ca4b
author Yifan Hong <elsk@google.com> Wed Nov 27 13:16:04 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 13:16:04 2019 -0800
tree f2c83073d1d9677cf12d72edcf0b97c15fe240f3
parent 46754cb8a729b6c695a15341742ce2e764a3e1c2
parent c3e0ca19110c4fe2f3c7d12d9ef98b32960a42f2

Merge "libsnapshot: Fix test UpdateBootControlHal" am: 834e4751e6
am: c3e0ca1911

Change-Id: I80388179c5a0e06b3f7e4a7700a83ea0bd327914

fs_mgr/libsnapshot/snapshot_test.cpp

diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp
index 12bf399..7d6e78f 100644
--- a/fs_mgr/libsnapshot/snapshot_test.cpp
+++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -577,7 +577,7 @@
     ASSERT_EQ(test_device->merge_status(), MergeStatus::NONE);
 
     ASSERT_TRUE(sm->WriteUpdateState(lock_.get(), UpdateState::Initiated));
-    ASSERT_EQ(test_device->merge_status(), MergeStatus::SNAPSHOTTED);
+    ASSERT_EQ(test_device->merge_status(), MergeStatus::NONE);
 
     ASSERT_TRUE(sm->WriteUpdateState(lock_.get(), UpdateState::Unverified));
     ASSERT_EQ(test_device->merge_status(), MergeStatus::SNAPSHOTTED);