Support changing from non-canary to canary channel in update engine.
Now that we have added support in lsb-release for both the board appid
and canary app id to be specified, we should use the appropriate appid
according to the channel from which we want to download the new payload.
This change in update engine will enable the change from non-canary to
canary channels. This feature when be lit up end to end when the UI for
this scenario is ready.
BUG=chromium:225866
TEST=Unit tests pass. Tested all channel changes on my ZGB.
Change-Id: Ia9c37c72f53f6c69436f0a96e35d2584d84653c8
Reviewed-on: https://gerrit.chromium.org/gerrit/47181
Commit-Queue: Jay Srinivasan <jaysri@chromium.org>
Reviewed-by: Jay Srinivasan <jaysri@chromium.org>
Tested-by: Jay Srinivasan <jaysri@chromium.org>
diff --git a/omaha_request_params_unittest.cc b/omaha_request_params_unittest.cc
index 7d81ba7..31ccd66 100644
--- a/omaha_request_params_unittest.cc
+++ b/omaha_request_params_unittest.cc
@@ -89,7 +89,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_EQ("", out.hwid());
@@ -113,7 +113,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{58c35cef-9d30-476e-9098-ce20377d535d}", out.app_id());
+ EXPECT_EQ("{58c35cef-9d30-476e-9098-ce20377d535d}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_EQ("", out.hwid());
@@ -133,7 +133,7 @@
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_EQ("", out.target_channel());
@@ -150,7 +150,7 @@
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_EQ("", out.target_channel());
@@ -168,7 +168,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("_") + GetMachineType(), out.os_sp());
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_TRUE(out.delta_okay());
@@ -187,7 +187,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("ForcedVersion_") + GetMachineType(), out.os_sp());
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("ForcedVersion", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_TRUE(out.delta_okay());
@@ -207,7 +207,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_TRUE(out.delta_okay());
@@ -228,7 +228,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_TRUE(out.delta_okay());
@@ -268,7 +268,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
EXPECT_EQ("x86-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_EQ("", out.hwid());
@@ -295,7 +295,7 @@
OmahaRequestParams out(&mock_system_state);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("", out.hwid());
EXPECT_FALSE(out.delta_okay());
@@ -319,7 +319,7 @@
OmahaRequestParams out(&mock_system_state);
EXPECT_TRUE(DoTest(&out, "", ""));
EXPECT_EQ("x86-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("", out.hwid());
EXPECT_TRUE(out.delta_okay());
@@ -427,7 +427,7 @@
EXPECT_EQ("Chrome OS", out.os_platform());
EXPECT_EQ(string("0.2.2.3_") + GetMachineType(), out.os_sp());
EXPECT_EQ("arm-generic", out.os_board());
- EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.app_id());
+ EXPECT_EQ("{87efface-864d-49a5-9bb3-4b050a7c227a}", out.GetAppId());
EXPECT_EQ("0.2.2.3", out.app_version());
EXPECT_EQ("en-US", out.app_lang());
EXPECT_EQ("", out.hwid());
@@ -535,4 +535,45 @@
EXPECT_FALSE(params_.ShouldLockDown());
}
+TEST_F(OmahaRequestParamsTest, BoardAppIdUsedForNonCanaryChannelTest) {
+ ASSERT_TRUE(WriteFileString(
+ kTestDir + "/etc/lsb-release",
+ "CHROMEOS_RELEASE_APPID=r\n"
+ "CHROMEOS_BOARD_APPID=b\n"
+ "CHROMEOS_CANARY_APPID=c\n"
+ "CHROMEOS_RELEASE_TRACK=stable-channel\n"));
+ MockSystemState mock_system_state;
+ OmahaRequestParams out(&mock_system_state);
+ EXPECT_TRUE(DoTest(&out, "", ""));
+ EXPECT_EQ("stable-channel", out.download_channel());
+ EXPECT_EQ("b", out.GetAppId());
+}
+
+TEST_F(OmahaRequestParamsTest, CanaryAppIdUsedForCanaryChannelTest) {
+ ASSERT_TRUE(WriteFileString(
+ kTestDir + "/etc/lsb-release",
+ "CHROMEOS_RELEASE_APPID=r\n"
+ "CHROMEOS_BOARD_APPID=b\n"
+ "CHROMEOS_CANARY_APPID=c\n"
+ "CHROMEOS_RELEASE_TRACK=canary-channel\n"));
+ MockSystemState mock_system_state;
+ OmahaRequestParams out(&mock_system_state);
+ EXPECT_TRUE(DoTest(&out, "", ""));
+ EXPECT_EQ("canary-channel", out.download_channel());
+ EXPECT_EQ("c", out.GetAppId());
+}
+
+TEST_F(OmahaRequestParamsTest, ReleaseAppIdUsedAsDefaultTest) {
+ ASSERT_TRUE(WriteFileString(
+ kTestDir + "/etc/lsb-release",
+ "CHROMEOS_RELEASE_APPID=r\n"
+ "CHROMEOS_CANARY_APPID=c\n"
+ "CHROMEOS_RELEASE_TRACK=stable-channel\n"));
+ MockSystemState mock_system_state;
+ OmahaRequestParams out(&mock_system_state);
+ EXPECT_TRUE(DoTest(&out, "", ""));
+ EXPECT_EQ("stable-channel", out.download_channel());
+ EXPECT_EQ("r", out.GetAppId());
+}
+
} // namespace chromeos_update_engine