Removed RollbackOnlyIfRestorePossible option from DeviceRollbackToTargetVersion policy
As this option was not implemented and won't be launched, so it should be removed from documentation and codebase before feature launch.
BUG=chromium:947621
TEST=./build_packages --board=amd64-generic && \
cros_run_unit_tests --board=amd64-generic --packages update_engine
Change-Id: I11ffeb7b65f55e9b026bd4673d16900c34627b34
Reviewed-on: https://chromium-review.googlesource.com/1619795
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Aya Elsayed <ayaelattar@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
diff --git a/update_manager/boxed_value.cc b/update_manager/boxed_value.cc
index cee1ece..ef321e6 100644
--- a/update_manager/boxed_value.cc
+++ b/update_manager/boxed_value.cc
@@ -167,8 +167,6 @@
return "Rollback and powerwash";
case RollbackToTargetVersion::kRollbackAndRestoreIfPossible:
return "Rollback and restore if possible";
- case RollbackToTargetVersion::kRollbackOnlyIfRestorePossible:
- return "Rollback only if restore is possible";
case RollbackToTargetVersion::kMaxValue:
NOTREACHED();
return "Max value";
diff --git a/update_manager/boxed_value_unittest.cc b/update_manager/boxed_value_unittest.cc
index 2fa94ec..f98b6b6 100644
--- a/update_manager/boxed_value_unittest.cc
+++ b/update_manager/boxed_value_unittest.cc
@@ -215,11 +215,6 @@
BoxedValue(new RollbackToTargetVersion(
RollbackToTargetVersion::kRollbackAndRestoreIfPossible))
.ToString());
- EXPECT_EQ(
- "Rollback only if restore is possible",
- BoxedValue(new RollbackToTargetVersion(
- RollbackToTargetVersion::kRollbackOnlyIfRestorePossible))
- .ToString());
}
TEST(UmBoxedValueTest, SetConnectionTypeToString) {
diff --git a/update_manager/chromeos_policy_unittest.cc b/update_manager/chromeos_policy_unittest.cc
index 5341ebb..fb8c789 100644
--- a/update_manager/chromeos_policy_unittest.cc
+++ b/update_manager/chromeos_policy_unittest.cc
@@ -284,12 +284,6 @@
true, RollbackToTargetVersion::kRollbackAndRestoreIfPossible));
}
-TEST_F(UmChromeOSPolicyTest, UpdateCheckAllowedRollbackOnlyIfRestorePossible) {
- // We're not allowed to do rollback until we support data save and restore.
- EXPECT_FALSE(TestRollbackAllowed(
- true, RollbackToTargetVersion::kRollbackOnlyIfRestorePossible));
-}
-
TEST_F(UmChromeOSPolicyTest, UpdateCheckAllowedRollbackDisabled) {
EXPECT_FALSE(TestRollbackAllowed(true, RollbackToTargetVersion::kDisabled));
}
diff --git a/update_manager/enterprise_device_policy_impl.cc b/update_manager/enterprise_device_policy_impl.cc
index 3d77d59..dea38ba 100644
--- a/update_manager/enterprise_device_policy_impl.cc
+++ b/update_manager/enterprise_device_policy_impl.cc
@@ -104,15 +104,6 @@
result->rollback_allowed = true;
result->rollback_data_save_requested = true;
break;
- case RollbackToTargetVersion::kRollbackOnlyIfRestorePossible:
- // TODO(crbug.com/947621): Remove this policy option until we know
- // how it could be supported correctly.
- LOG(INFO) << "Policy only allows rollbacks if restore is possible.";
- // We don't support restore yet, policy doesn't allow rollback in this
- // case.
- result->rollback_allowed = false;
- result->rollback_data_save_requested = false;
- break;
case RollbackToTargetVersion::kMaxValue:
NOTREACHED();
// Don't add a default case to let the compiler warn about newly
diff --git a/update_manager/rollback_prefs.h b/update_manager/rollback_prefs.h
index 11d09d6..9567701 100644
--- a/update_manager/rollback_prefs.h
+++ b/update_manager/rollback_prefs.h
@@ -31,9 +31,8 @@
kDisabled = 1,
kRollbackAndPowerwash = 2,
kRollbackAndRestoreIfPossible = 3,
- kRollbackOnlyIfRestorePossible = 4,
// This value must be the last entry.
- kMaxValue = 5
+ kMaxValue = 4
};
} // namespace chromeos_update_manager
