Stop git cl using CQ_TRYBOTS.

This is broken for a few reasons (see bug for details). Also, this works automatically now with the analyze step.

This is a revert of r280039.

BUG=406238
R=iannucci@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/501503002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291526 0039d316-1c4b-4281-b951-d872f2087c98

git_cl.py

@@ -1570,7 +1570,7 @@ def GerritUpload(options, args, cl):
   return 0
 
 
-def RietveldUpload(options, args, cl, change):
+def RietveldUpload(options, args, cl):
   """upload the patch to rietveld."""
   upload_args = ['--assume_yes']  # Don't ask about untracked files.
   upload_args.extend(['--server', cl.GetRietveldServer()])
@@ -1597,22 +1597,6 @@ def RietveldUpload(options, args, cl, change):
     change_desc = ChangeDescription(message)
     if options.reviewers:
       change_desc.update_reviewers(options.reviewers)
-    if options.auto_bots:
-      masters = presubmit_support.DoGetTryMasters(
-          change,
-          change.LocalPaths(),
-          settings.GetRoot(),
-          None,
-          None,
-          options.verbose,
-          sys.stdout)
-
-      if masters:
-        change_description = change_desc.description + '\nCQ_TRYBOTS='
-        lst = []
-        for master, mapping in masters.iteritems():
-          lst.append(master + ':' + ','.join(mapping.keys()))
-        change_desc.set_description(change_description + ';'.join(lst))
     if not options.force:
       change_desc.prompt()
 
@@ -1746,8 +1730,6 @@ def CMDupload(parser, args):
                          'use for CL.  Default: master')
   parser.add_option('--email', default=None,
                     help='email address to use to connect to Rietveld')
-  parser.add_option('--auto-bots', default=False, action='store_true',
-                    help='Autogenerate which trybots to use for this CL')
 
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
@@ -1807,7 +1789,7 @@ def CMDupload(parser, args):
   print_stats(options.similarity, options.find_copies, args)
   if settings.GetIsGerrit():
     return GerritUpload(options, args, cl)
-  ret = RietveldUpload(options, args, cl, change)
+  ret = RietveldUpload(options, args, cl)
   if not ret:
     git_set_branch_value('last-upload-hash',
                          RunGit(['rev-parse', 'HEAD']).strip())

tests/git_cl_test.py

@@ -10,7 +10,6 @@ import StringIO
 import stat
 import sys
 import unittest
-import re
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -19,7 +18,6 @@ from testing_support.auto_stub import TestCase
 import git_cl
 import git_common
 import subprocess2
-import presubmit_support
 
 class PresubmitMock(object):
   def __init__(self, *args, **kwargs):
@@ -755,122 +753,6 @@ class TestGitCl(TestCase):
       actual.append(obj.description)
     self.assertEqual(expected, actual)
 
-  def test_trybots_from_PRESUBMIT(self):
-    TEST_MASTER = 'testMaster'
-    TEST_BUILDER = 'testBuilder'
-    MASTERS = {TEST_MASTER:{TEST_BUILDER:['a']}}
-    self.mock(presubmit_support, 'DoGetTryMasters',
-              lambda *args: MASTERS)
-
-    change_mock = ChangeMock()
-    changelist_mock = ChangelistMock(change_mock)
-    self.mock(git_cl, 'is_dirty_git_tree', lambda x: False)
-    self.mock(git_cl, 'print_stats', lambda *arg: True)
-    self.mock(git_cl, 'Changelist',  lambda *args: changelist_mock)
-    self.mock(git_cl, 'CreateDescriptionFromLog', lambda arg: 'Commit message')
-    self.mock(git_cl.ChangeDescription, 'prompt', lambda self: None)
-
-    self.calls = [
-        ((['git', 'config', 'rietveld.autoupdate',],),
-         ''),
-        ((['git', 'config', 'gerrit.host',],),
-         ''),
-        ((['git', 'rev-parse', '--show-cdup',],),
-         ''),
-        ((['git', 'config', 'rietveld.private',],),
-         ''),
-        ((['git', 'config', 'rietveld.pending-ref-prefix',],),
-         ''),
-        ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
-         ''),
-        ((['git', 'config', 'rietveld.project',],),
-         ''),
-        ((['git', 'rev-parse', 'HEAD',],),
-         ''),
-        ]
-
-    stored_description = []
-    def check_upload(args):
-      i = 0
-      for arg in args:
-        if arg == '--message':
-          break
-        i += 1
-
-      self.assertTrue(i < len(args))
-      stored_description.append(args[i+1])
-      return 1, 2
-    self.mock(git_cl.upload, 'RealMain', check_upload)
-
-    git_cl.main(['upload', '--bypass-hooks', '--auto-bots'])
-    found = re.search("CQ_TRYBOTS=(.*?)$", stored_description[0])
-    self.assertTrue(found)
-    self.assertEqual(found.group(1), '%s:%s' % (TEST_MASTER, TEST_BUILDER))
-
-
-class ChangelistMock(object):
-  # Disable "Method could be a function"
-  # pylint: disable=R0201
-
-  def __init__(self, change_mock):
-    self.change_mock = change_mock
-
-  def GetChange(self, *args):
-    return self.change_mock
-
-  def GetIssue(self):
-    return None
-
-  def GetBranch(self):
-    return []
-
-  def GetCommonAncestorWithUpstream(self):
-    return []
-
-  def GetCCList(self):
-    return []
-
-  def GetGitBaseUrlFromConfig(self):
-    return ''
-
-  def GetRemoteUrl(self):
-    return ''
-
-  def GetRietveldServer(self):
-    return None
-
-  def SetWatchers(self, *args):
-    pass
-
-  def SetIssue(self, issue):
-    pass
-
-  def SetPatchset(self, issue):
-    pass
-
-
-class ChangeMock(object):
-  # Disable "Method could be a function"
-  # pylint: disable=R0201
-
-  def __init__(self):
-    self.stored_description = None
-
-  def SetDescriptionText(self, desc):
-    self.stored_description = desc
-
-  def FullDescriptionText(self):
-    return 'HIHI TEST DESCRIPTION'
-
-  def RepositoryRoot(self):
-    return []
-
-  def AffectedFiles(self):
-    return []
-
-  def LocalPaths(self):
-    return None
-
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)