diff options
Diffstat (limited to 'fs_mgr/libsnapshot/snapshot_test.cpp')
| -rw-r--r-- | fs_mgr/libsnapshot/snapshot_test.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp index d57aa6c22..bde4ccadd 100644 --- a/fs_mgr/libsnapshot/snapshot_test.cpp +++ b/fs_mgr/libsnapshot/snapshot_test.cpp @@ -636,8 +636,8 @@ TEST_F(SnapshotTest, FlashSuperDuringMerge) { // Because the status is Merging, we must call ProcessUpdateState, which should // detect a cancelled update. - ASSERT_EQ(sm->ProcessUpdateState(), UpdateState::Cancelled); - ASSERT_EQ(sm->GetUpdateState(), UpdateState::None); + ASSERT_EQ(init->ProcessUpdateState(), UpdateState::Cancelled); + ASSERT_EQ(init->GetUpdateState(), UpdateState::None); } TEST_F(SnapshotTest, UpdateBootControlHal) { @@ -1767,7 +1767,7 @@ TEST_F(SnapshotUpdateTest, DataWipeRollbackInRecovery) { ASSERT_TRUE(new_sm->HandleImminentDataWipe()); // Manually mount metadata so that we can call GetUpdateState() below. MountMetadata(); - EXPECT_EQ(new_sm->GetUpdateState(), UpdateState::Unverified); + EXPECT_EQ(new_sm->GetUpdateState(), UpdateState::None); EXPECT_TRUE(test_device->IsSlotUnbootable(1)); EXPECT_FALSE(test_device->IsSlotUnbootable(0)); } @@ -2105,8 +2105,12 @@ TEST_P(FlashAfterUpdateTest, FlashSlotAfterUpdate) { // There should be no snapshot to merge. auto new_sm = SnapshotManager::New(new TestDeviceInfo(fake_super, flashed_slot_suffix)); - // update_enigne calls ProcessUpdateState first -- should see Cancelled. - ASSERT_EQ(UpdateState::Cancelled, new_sm->ProcessUpdateState()); + if (flashed_slot == 0 && after_merge) { + ASSERT_EQ(UpdateState::MergeCompleted, new_sm->ProcessUpdateState()); + } else { + // update_engine calls ProcessUpdateState first -- should see Cancelled. + ASSERT_EQ(UpdateState::Cancelled, new_sm->ProcessUpdateState()); + } // Next OTA calls CancelUpdate no matter what. ASSERT_TRUE(new_sm->CancelUpdate()); |