commit 9c39e0c3432b0649728e4302223309216cb575ce
author Shao-Chuan Lee <shaochuan@google.com> Fri Apr 24 11:40:34 2020 +0900
committer Commit Bot <commit-bot@chromium.org> Mon Apr 27 04:29:12 2020 +0000
tree fd40199dd02913a07a32db26f8dc7652ff118f4a
parent ee5a40789efc4450d164d8e5eca7224c581c51f6

cros_mark_android_as_stable: remove android_gts_build_branch

BUG=chromium:1074145
TEST=./run_tests; ./api/compile_build_api_proto

Cq-Depend: chromium:2162417
Change-Id: I6d266af11008841fa7e802294e9146e60cda0583
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2162670
Commit-Queue: Shao-Chuan Lee <shaochuan@chromium.org>
Tested-by: Shao-Chuan Lee <shaochuan@chromium.org>
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>

api/controller/android_unittest.py

diff --git a/api/controller/android_unittest.py b/api/controller/android_unittest.py
index 5f44fb1..a2bc630 100644
--- a/api/controller/android_unittest.py
+++ b/api/controller/android_unittest.py
@@ -86,7 +86,6 @@
   def testCallsCommandCorrectly(self):
     """Test that commands.MarkAndroidAsStable is called correctly."""
     self.input_proto.android_version = 'android-version'
-    self.input_proto.android_gts_build_branch = 'gts-branch'
     self.uprev.return_value = 'cat/android-1.2.3'
     atom = common_pb2.PackageInfo()
     atom.category = 'cat'
@@ -99,8 +98,7 @@
         android_build_branch=self.input_proto.android_build_branch,
         chroot=mock.ANY,
         build_targets=self.build_targets,
-        android_version=self.input_proto.android_version,
-        android_gts_build_branch=self.input_proto.android_gts_build_branch)
+        android_version=self.input_proto.android_version)
     self.assertEqual(self.response.android_atom, atom)
     self.assertEqual(self.response.status,
                      android_pb2.MARK_STABLE_STATUS_SUCCESS)
@@ -108,7 +106,6 @@
   def testHandlesEarlyExit(self):
     """Test that early exit is handled correctly."""
     self.input_proto.android_version = 'android-version'
-    self.input_proto.android_gts_build_branch = 'gts-branch'
     self.uprev.return_value = ''
     android.MarkStable(self.input_proto, self.response, self.api_config)
     self.uprev.assert_called_once_with(
@@ -117,15 +114,13 @@
         android_build_branch=self.input_proto.android_build_branch,
         chroot=mock.ANY,
         build_targets=self.build_targets,
-        android_version=self.input_proto.android_version,
-        android_gts_build_branch=self.input_proto.android_gts_build_branch)
+        android_version=self.input_proto.android_version)
     self.assertEqual(self.response.status,
                      android_pb2.MARK_STABLE_STATUS_EARLY_EXIT)
 
   def testHandlesPinnedUprevError(self):
     """Test that pinned error is handled correctly."""
     self.input_proto.android_version = 'android-version'
-    self.input_proto.android_gts_build_branch = 'gts-branch'
     self.uprev.side_effect = packages.AndroidIsPinnedUprevError('pin/xx-1.1')
     atom = common_pb2.PackageInfo()
     atom.category = 'pin'
@@ -138,8 +133,7 @@
         android_build_branch=self.input_proto.android_build_branch,
         chroot=mock.ANY,
         build_targets=self.build_targets,
-        android_version=self.input_proto.android_version,
-        android_gts_build_branch=self.input_proto.android_gts_build_branch)
+        android_version=self.input_proto.android_version)
     self.assertEqual(self.response.android_atom, atom)
     self.assertEqual(self.response.status,
                      android_pb2.MARK_STABLE_STATUS_PINNED)