diff options
| author | Amin Hassani <ahassani@chromium.org> | 2019-08-29 09:20:12 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-09-05 17:21:07 +0000 |
| commit | 9be122effd4022e14cc158191e11ca230a605544 (patch) | |
| tree | 901e425a6b1c1f7f289683dbd39bd8994266212f /update_status_utils_unittest.cc | |
| parent | 0199b7544974a4d61ddb52a0591d8f3e2d9757b9 (diff) | |
update_engine: Pass is_enterprise_rollback in the StatusResult
Currently Chrome uses some sort of version comparison to define whether
an update is a rollback or not. But that is not very robust. The correct
way is the return this value in the StatusResult. We already have this
value as a placeholder in the update_engine.proto. So this is good to
go.
BUG=chromium:864672
TEST=FEATUERS=test emerge-reef update_engine
Change-Id: I8bd3af0d94abd656dc00a9e67550ea6c6913de91
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/1775116
Tested-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Diffstat (limited to 'update_status_utils_unittest.cc')
| -rw-r--r-- | update_status_utils_unittest.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/update_status_utils_unittest.cc b/update_status_utils_unittest.cc index dbd80d7a..3af30c78 100644 --- a/update_status_utils_unittest.cc +++ b/update_status_utils_unittest.cc @@ -24,22 +24,11 @@ using std::string; namespace chromeos_update_engine { -TEST(UpdateStatusUtilsTest, UpdateEngineStatusToStringDefaultTest) { - string print = - R"(CURRENT_OP=UPDATE_STATUS_IDLE -IS_INSTALL=false -LAST_CHECKED_TIME=0 -NEW_SIZE=0 -NEW_VERSION= -PROGRESS=0.0 -)"; - EXPECT_EQ(print, UpdateEngineStatusToString({})); -} - TEST(UpdateStatusUtilsTest, UpdateEngineStatusToStringTest) { update_engine::UpdateEngineStatus update_engine_status = { .status = update_engine::UpdateStatus::CHECKING_FOR_UPDATE, .is_install = true, + .is_enterprise_rollback = true, .last_checked_time = 156000000, .new_size_bytes = 888, .new_version = "12345.0.0", @@ -47,6 +36,7 @@ TEST(UpdateStatusUtilsTest, UpdateEngineStatusToStringTest) { }; string print = R"(CURRENT_OP=UPDATE_STATUS_CHECKING_FOR_UPDATE +IS_ENTERPRISE_ROLLBACK=true IS_INSTALL=true LAST_CHECKED_TIME=156000000 NEW_SIZE=888 |