git cl try: support multiple bots from different masters without specifying master.

tests/git_cl_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for git_cl.py."""
 
 import json
 import os
 import StringIO
@@ skipping 1971 matching lines @@
         ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
         ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
         ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
         ((['git', 'config', 'rietveld.server'],),
          'https://codereview.chromium.org'),
         ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
         ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
     ]
 
     def _buildbucket_retry(*_, **kw):
-      # self.maxDiff = 10000
       body = json.loads(kw['body'])
       self.assertEqual(len(body['builds']), 1)
       build = body['builds'][0]
       params = json.loads(build.pop('parameters_json'))
       self.assertEqual(params, {
         u'builder_name': u'win',
         u'changes': [{u'author': {u'email': u'owner@e.mail'},
                       u'revision': None}],
         u'properties': {
           u'category': u'git_cl_try',
@@ skipping 15 matching lines @@
 
     self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
 
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     self.assertEqual(0, git_cl.main([
         'try', '-B', 'test.bucket', '-b', 'win']))
     self.assertRegexpMatches(
         git_cl.sys.stdout.getvalue(),
         'Tried jobs on:\nBucket: test.bucket')
 
+  def test_git_cl_try_bots_on_multiple_masters(self):
+    self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
+    self.calls = [
+      ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
+      ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
+      ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
+      ((['git', 'config', 'rietveld.server'],),
+       'https://codereview.chromium.org'),
+      ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
+      ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
+    ]
+
+    def _buildbucket_retry(*_, **kw):
+      body = json.loads(kw['body'])
+      self.assertEqual(len(body['builds']), 2)
+
+      first_build_params = json.loads(body['builds'][0]['parameters_json'])
+      self.assertEqual(first_build_params['builder_name'], 'builder1')
+      self.assertEqual(first_build_params['properties']['master'], 'master1')
+
+      first_build_params = json.loads(body['builds'][1]['parameters_json'])
+      self.assertEqual(first_build_params['builder_name'], 'builder2')
+      self.assertEqual(first_build_params['properties']['master'], 'master2')
+
+    self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
+
+    self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
+      json.dumps({"builder1": ["master1"], "builder2": ["master2"]})))

[tandrii(chromium), 2016/10/26 09:55:01]

nit: single quotes.

[qyearsley, 2016/10/26 16:08:47]

Done

+
+    self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
+    self.assertEqual(
+        0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
+    self.assertEqual(
+        git_cl.sys.stdout.getvalue(),
+        'Tried jobs on:\n'
+        'Bucket: master.master1\n'
+        '  builder1: []\n'
+        'Bucket: master.master2\n'
+        '  builder2: []\n'
+        'To see results here, run:        git cl try-results\n'
+        'To see results in browser, run:  git cl web\n')
+
   def _common_GerritCommitMsgHookCheck(self):
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     self.mock(git_cl.os.path, 'abspath',
               lambda path: self._mocked_call(['abspath', path]))
     self.mock(git_cl.os.path, 'exists',
               lambda path: self._mocked_call(['exists', path]))
     self.mock(git_cl.gclient_utils, 'FileRead',
               lambda path: self._mocked_call(['FileRead', path]))
     self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
               lambda path: self._mocked_call(['rm_file_or_tree', path]))
@@ skipping 177 matching lines @@
     self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
     self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
     self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
     self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()