commit f34c3ecd745de267e2acdd3285f7c1805cd30589
author Yifan Hong <elsk@google.com> Wed Nov 27 13:19:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 13:19:09 2019 -0800
tree 1f3137dabff592d1affec01353ca5ca9f1287717
parent a7f12f089ea9d0167f73ea639379dd149d374dc3
parent b7ee4eb9b0f295e1aa1ebda9fc5b9ec430b0ca4b

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

Change-Id: I988e33ae56083ff4717155c335b27bb6f2f18088

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);