commit c3e0ca19110c4fe2f3c7d12d9ef98b32960a42f2
author Yifan Hong <elsk@google.com> Wed Nov 27 13:13:03 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 13:13:03 2019 -0800
tree dcd93cea41d3c16d4631da652d1f190f0076a2f4
parent 3b469dea100f25e086e14ca91e16fbd701f3b813
parent 834e4751e64bfa94c7d5a7bd929070a1a5cf0fe4

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

Change-Id: I93a3e5a36b5980f004b18257fcd74b16a13fe735

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