commit 44b680918c6a5d8e9af96c239cbb044588551487
author Yifan Hong <elsk@google.com> Tue Nov 26 12:40:48 2019 -0800
committer Yifan Hong <elsk@google.com> Tue Nov 26 21:26:56 2019 +0000
tree 3cc004f3d2452cfbdcd2cfcd73ad9fa07ff1e513
parent 8aa5adf760dd286a1e1bcd27b5c31c6746bfa3c5

libsnapshot: Fix test UpdateBootControlHal

Test: run it
Change-Id: I885404184f35a8d6ecb2fe267bd48b25f1164e20

fs_mgr/libsnapshot/snapshot_test.cpp

diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp
index 8783526..b52bcf1 100644
--- a/fs_mgr/libsnapshot/snapshot_test.cpp
+++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -575,7 +575,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);