commit ce3f7cf69f3a03a5371beecae003651fa7f953a3
author Sen Jiang <senj@google.com> Thu Jan 25 14:07:45 2018 -0800
committer Sen Jiang <senj@google.com> Wed Jan 31 04:04:40 2018 +0000
tree 8f8623e162c0a0c134253fe341c4d95daa78503b
parent 1a7bb2c4a2b21700893b4382d9e8ea017e61c75b

Make sure channel ends with -channel.

Also changed to_more_stable_channel() to return true for arbitrary channels.

Bug: 72259103
Test: update_engine_unittests

Change-Id: Ifddbc5f28563c956241c69141523c5a73ba53151

omaha_request_params_unittest.cc

diff --git a/omaha_request_params_unittest.cc b/omaha_request_params_unittest.cc
index 6705c71..2de45de 100644
--- a/omaha_request_params_unittest.cc
+++ b/omaha_request_params_unittest.cc
@@ -170,6 +170,8 @@
   EXPECT_FALSE(params_.IsValidChannel(""));
   params_.image_props_.allow_arbitrary_channels = true;
   EXPECT_TRUE(params_.IsValidChannel("some-channel"));
+  EXPECT_FALSE(params_.IsValidChannel("wrong-suffix"));
+  EXPECT_FALSE(params_.IsValidChannel(""));
 }
 
 TEST_F(OmahaRequestParamsTest, SetTargetChannelWorks) {
@@ -231,6 +233,12 @@
   params_.image_props_.current_channel = "canary-channel";
   params_.download_channel_ = "stable-channel";
   EXPECT_TRUE(params_.to_more_stable_channel());
+  params_.image_props_.current_channel = "stable-channel";
+  EXPECT_FALSE(params_.to_more_stable_channel());
+  params_.download_channel_ = "beta-channel";
+  EXPECT_FALSE(params_.to_more_stable_channel());
+  params_.download_channel_ = "some-channel";
+  EXPECT_TRUE(params_.to_more_stable_channel());
 }
 
 TEST_F(OmahaRequestParamsTest, CollectECFWVersionsTest) {