commit b6a2cb6fd0d409cafd16f79f2d924c7ce9d858ee
author Shao-Chuan Lee <shaochuan@chromium.org> Fri Feb 19 14:18:59 2021 +0900
committer Commit Bot <commit-bot@chromium.org> Thu Mar 04 00:53:32 2021 +0000
tree efdf06df2fb4ce35e7713841921684c343137c89
parent c6f21d60ba66de5d409551d83ba5e5ecae8ad583

Remove tracking_branch option from cros_mark_android_as_stable

The option is deprecated. Usage in infra/recipes was removed in
crrev.com/c/2702873.

BUG=chromium:1074145
TEST=./run_pytest

Change-Id: I99c14380e93d5d50a21a8b6a9f5cb370e526a7c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2706326
Tested-by: Shao-Chuan Lee <shaochuan@chromium.org>
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Shao-Chuan Lee <shaochuan@chromium.org>

service/packages_unittest.py

diff --git a/service/packages_unittest.py b/service/packages_unittest.py
index 33b8d04..9841e0a 100644
--- a/service/packages_unittest.py
+++ b/service/packages_unittest.py
@@ -49,12 +49,10 @@
                          stdout='ANDROID_ATOM=android/android-1.0\n')
     build_targets = [build_target_lib.BuildTarget(t) for t in ['foo', 'bar']]
 
-    packages.uprev_android('refs/tracking-branch', 'android/package',
-                           'refs/android-build-branch', Chroot(),
-                           build_targets=build_targets)
+    packages.uprev_android('android/package', 'refs/android-build-branch',
+                           Chroot(), build_targets=build_targets)
     self.assertCommandContains([
         'cros_mark_android_as_stable',
-        '--tracking_branch=refs/tracking-branch',
         '--android_package=android/package',
         '--android_build_branch=refs/android-build-branch',
         '--boards=foo:bar'
@@ -67,9 +65,8 @@
     self.rc.AddCmdResult(partial_mock.In('cros_mark_android_as_stable'),
                          stdout='ANDROID_ATOM=android/android-1.0\n')
 
-    packages.uprev_android('refs/tracking-branch', 'android/package',
-                           'refs/android-build-branch', Chroot(),
-                           skip_commit=True)
+    packages.uprev_android('android/package', 'refs/android-build-branch',
+                           Chroot(), skip_commit=True)
     self.assertCommandContains(['cros_mark_android_as_stable',
                                 '--skip_commit'])
 
@@ -78,9 +75,8 @@
     self.rc.AddCmdResult(partial_mock.In('cros_mark_android_as_stable'),
                          stdout='')
     build_targets = [build_target_lib.BuildTarget(t) for t in ['foo', 'bar']]
-    packages.uprev_android('refs/tracking-branch', 'android/package',
-                           'refs/android-build-branch', Chroot(),
-                           build_targets=build_targets)
+    packages.uprev_android('android/package', 'refs/android-build-branch',
+                           Chroot(), build_targets=build_targets)
 
     self.assertCommandContains(['cros_mark_android_as_stable',
                                 '--boards=foo:bar'])