commit 4576851428ddafb6b996765adcbd4e5918145e6d
author Edward Lemur <ehmaldonado@google.com> Mon Mar 02 19:03:14 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Mar 02 19:03:14 2020 +0000
tree 96e67611e6ab6a1a25805bd73b3bd6c339f3664f
parent 9ca9c52c4c04eee136f37bab1404ae0c2319bf06

git-cl: Remove support for GetPreferredTryMasters.

Bug: 1042324
Change-Id: I9d554d8ffe5c17278d4cd90d2aa0a49fc329f695
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2075797
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

tests/git_cl_test.py

diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 926afbe..87dcb3b 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -3104,13 +3104,13 @@
         'file.json', self._DEFAULT_RESPONSE['builds'])
 
   def test_filter_failed_for_one_simple(self):
-    self.assertEqual({}, git_cl._filter_failed_for_retry([]))
-    self.assertEqual({
-        'chromium/try': {
-            'bot_failure': [],
-            'bot_infra_failure': []
-        },
-    }, git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
+    self.assertEqual([], git_cl._filter_failed_for_retry([]))
+    self.assertEqual(
+        [
+            ('chromium', 'try', 'bot_failure'),
+            ('chromium', 'try', 'bot_infra_failure'),
+        ],
+        git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
 
   def test_filter_failed_for_retry_many_builds(self):
 
@@ -3149,19 +3149,18 @@
         _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
     ]
     builds.sort(key=lambda b: b['status'])  # ~deterministic shuffle.
-    self.assertEqual({
-        'chromium/try': {
-            'flaky': [],
-            'sometimes-experimental': []
-        },
-    }, git_cl._filter_failed_for_retry(builds))
+    self.assertEqual(
+        [
+            ('chromium', 'try', 'flaky'),
+            ('chromium', 'try', 'sometimes-experimental'),
+        ],
+        git_cl._filter_failed_for_retry(builds))
 
 
 class CMDTryTestCase(CMDTestCaseBase):
 
   @mock.patch('git_cl.Changelist.SetCQState')
-  @mock.patch('git_cl._get_bucket_map', return_value={})
-  def testSetCQDryRunByDefault(self, _mockGetBucketMap, mockSetCQState):
+  def testSetCQDryRunByDefault(self, mockSetCQState):
     mockSetCQState.return_value = 0
     self.assertEqual(0, git_cl.main(['try']))
     git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
@@ -3178,7 +3177,8 @@
         'try', '-B', 'luci.chromium.try', '-b', 'win',
         '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
     self.assertIn(
-        'Scheduling jobs on:\nBucket: luci.chromium.try',
+        'Scheduling jobs on:\n'
+        '  chromium/try: win',
         git_cl.sys.stdout.getvalue())
 
     expected_request = {
@@ -3220,7 +3220,9 @@
         '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
         '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
     self.assertIn(
-        'Scheduling jobs on:\nBucket: luci.chromium.try',
+        'Scheduling jobs on:\n'
+        '  chromium/try: linux\n'
+        '  chromium/try: win',
         git_cl.sys.stdout.getvalue())
 
     expected_request = {
@@ -3288,13 +3290,15 @@
     mockCallBuildbucket.assert_called_with(
         mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
 
+  @mock.patch('sys.stderr', StringIO())
   def testScheduleOnBuildbucket_WrongBucket(self):
-    self.assertEqual(0, git_cl.main([
-        'try', '-B', 'not-a-bucket', '-b', 'win',
-        '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
+    with self.assertRaises(SystemExit):
+      git_cl.main([
+          'try', '-B', 'not-a-bucket', '-b', 'win',
+          '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])
     self.assertIn(
-        'WARNING Could not parse bucket "not-a-bucket". Skipping.',
-        git_cl.sys.stdout.getvalue())
+        'Invalid bucket: not-a-bucket.',
+        sys.stderr.getvalue())
 
   @mock.patch('git_cl._call_buildbucket')
   @mock.patch('git_cl.fetch_try_jobs')
@@ -3316,7 +3320,8 @@
 
     self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
     self.assertIn(
-        'Scheduling jobs on:\nBucket: chromium/try',
+        'Scheduling jobs on:\n'
+        '  chromium/try: linux',
         git_cl.sys.stdout.getvalue())
 
     expected_request = {
@@ -3424,9 +3429,10 @@
         mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
         mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
     ], git_cl.fetch_try_jobs.mock_calls)
-    expected_buckets = {
-        'chromium/try': {'bot_failure': [], 'bot_infra_failure': []},
-    }
+    expected_buckets = [
+        ('chromium', 'try', 'bot_failure'),
+        ('chromium', 'try', 'bot_infra_failure'),
+    ]
     git_cl._trigger_try_jobs.assert_called_once_with(
         mock.ANY, expected_buckets, mock.ANY, 8)