diff options
| author | Alex Deymo <deymo@google.com> | 2015-10-05 16:59:23 -0700 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2015-10-05 20:39:35 -0700 |
| commit | 5ed695ec86f5ad495e387dde02b28089839d4ea1 (patch) | |
| tree | e3fd28eedf720e18ac39a594c714defa7ef123ad /filesystem_verifier_action_unittest.cc | |
| parent | 6b6cc1b788af989fb64116fb2e2299abac697510 (diff) | |
Mark the new slot as not ready from the DownloadAction.
The FilesystemVerifierAction used to copy over the old kernel and old
rootfs to the new slot, invalidating the contents of the new slot
during the copy. Since now it only parses the source partitions,
marking the new slot as unbootable can be delayed until the payload
starts to download.
Bug: 24667689
Test: FEATURES=test emerge-link update_engine
Change-Id: I17736a10787cb747d181e8dffcc0bc58f9a0cabb
Diffstat (limited to 'filesystem_verifier_action_unittest.cc')
| -rw-r--r-- | filesystem_verifier_action_unittest.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/filesystem_verifier_action_unittest.cc b/filesystem_verifier_action_unittest.cc index 32f3c59e..82803286 100644 --- a/filesystem_verifier_action_unittest.cc +++ b/filesystem_verifier_action_unittest.cc @@ -204,9 +204,6 @@ bool FilesystemVerifierActionTest::DoTest(bool terminate_early, break; } - fake_system_state_.fake_boot_control()->SetSlotBootable( - install_plan.target_slot, true); - ActionProcessor processor; ObjectFeederAction<InstallPlan> feeder_action; @@ -263,14 +260,6 @@ bool FilesystemVerifierActionTest::DoTest(bool terminate_early, bool is_install_plan_eq = (collector_action.object() == install_plan); EXPECT_TRUE(is_install_plan_eq); success = success && is_install_plan_eq; - - LOG(INFO) << "Verifying bootable flag on: " << a_dev; - - // We should always mark a partition as unbootable if it's a kernel - // partition, but never if it's anything else. - EXPECT_EQ((partition_type != PartitionType::kKernel), - fake_system_state_.fake_boot_control()->IsSlotBootable( - install_plan.target_slot)); return success; } |