commit ca3a327593e70b6acae804b39be0a7102d68382d
author Yifan Hong <elsk@google.com> Wed Nov 27 21:04:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 27 21:04:39 2019 +0000
tree dcd93cea41d3c16d4631da652d1f190f0076a2f4
parent a7c4a9b8a420e418beae7b8ca10fe5b39898fda8
parent 44b680918c6a5d8e9af96c239cbb044588551487

Merge "libsnapshot: Fix test UpdateBootControlHal"

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