Support for |change| argument to |GetPreferredTrySlaves()|, try 2.

Needed to make it so changes containing only *.mm are only sent to Mac trybots by default.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8059009

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

Author: [email protected]

gcl.py

@@ -961,11 +961,21 @@ def TryChange(change_info, args, swallow_exception):
     if change_info.patchset:
       trychange_args.extend(["--patchset", str(change_info.patchset)])
     file_list = change_info.GetFileNames()
+    change = presubmit_support.SvnChange(change_info.name,
+                                         change_info.description,
+                                         change_info.GetLocalRoot(),
+                                         change_info.GetFiles(),
+                                         change_info.issue,
+                                         change_info.patchset,
+                                         None)
   else:
     file_list = []
+    change = None
+
   trychange_args.extend(args)
   return trychange.TryChange(
       trychange_args,
+      change=change,
       file_list=file_list,
       swallow_exception=swallow_exception,
       prog='gcl try',

git_cl.py

@@ -488,8 +488,7 @@ def SetIssue(self, issue):
       self.SetPatchset(0)
     self.has_issue = False
 
-  def RunHook(self, committing, upstream_branch, may_prompt, verbose, author):
-    """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
+  def GetChange(self, upstream_branch, author):
     root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip() or '.'
     absroot = os.path.abspath(root)
 
@@ -511,7 +510,7 @@ def RunHook(self, committing, upstream_branch, may_prompt, verbose, author):
 
     if not author:
       author = RunGit(['config', 'user.email']).strip() or None
-    change = presubmit_support.GitChange(
+    return presubmit_support.GitChange(
         name,
         description,
         absroot,
@@ -520,6 +519,10 @@ def RunHook(self, committing, upstream_branch, may_prompt, verbose, author):
         patchset,
         author)
 
+  def RunHook(self, committing, upstream_branch, may_prompt, verbose, author):
+    """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
+    change = self.GetChange(upstream_branch, author)
+
     # Apply watchlists on upload.
     if not committing:
       watchlist = watchlists.Watchlists(change.RepositoryRoot())

git_try.py

@@ -13,6 +13,7 @@
 import subprocess2
 import third_party.upload
 import trychange
+import git_cl
 
 
 def GetRietveldIssueNumber():
@@ -53,8 +54,10 @@ def GetRietveldServerUrl():
   # Hack around a limitation in logging.
   logging.getLogger().handlers = []
   try:
+    cl = git_cl.Changelist()
+    change = cl.GetChange(cl.GetUpstreamBranch(), None)
     sys.exit(trychange.TryChange(
-        args, file_list=[], swallow_exception=False,
+        args, change, file_list=[], swallow_exception=False,
         prog='git try',
         extra_epilog='\n'
                      'git try will diff against your tracked branch and will '

presubmit_support.py

@@ -16,6 +16,7 @@
 import cStringIO  # Exposed through the API.
 import fnmatch
 import glob
+import inspect
 import logging
 import marshal  # Exposed through the API.
 import optparse
@@ -875,7 +876,7 @@ def ListRelevantPresubmitFiles(files, root):
 
 class GetTrySlavesExecuter(object):
   @staticmethod
-  def ExecPresubmitScript(script_text, presubmit_path, project):
+  def ExecPresubmitScript(script_text, presubmit_path, project, change):
     """Executes GetPreferredTrySlaves() from a single presubmit script.
 
     Args:
@@ -894,10 +895,14 @@ def ExecPresubmitScript(script_text, presubmit_path, project):
 
     function_name = 'GetPreferredTrySlaves'
     if function_name in context:
-      try:
-        result = eval(function_name + '(' + repr(project) + ')', context)
-      except TypeError:
-        result = eval(function_name + '()', context)
+      get_preferred_try_slaves = context[function_name]
+      function_info = inspect.getargspec(get_preferred_try_slaves)
+      if len(function_info[0]) == 1:
+        result = get_preferred_try_slaves(project)
+      elif len(function_info[0]) == 2:
+        result = get_preferred_try_slaves(project, change)
+      else:
+        result = get_preferred_try_slaves()
       if not isinstance(result, types.ListType):
         raise PresubmitFailure(
             'Presubmit functions must return a list, got a %s instead: %s' %
@@ -913,7 +918,8 @@ def ExecPresubmitScript(script_text, presubmit_path, project):
     return result
 
 
-def DoGetTrySlaves(changed_files,
+def DoGetTrySlaves(change,
+                   changed_files,
                    repository_root,
                    default_presubmit,
                    project,
@@ -942,15 +948,15 @@ def DoGetTrySlaves(changed_files,
       output_stream.write("Running default presubmit script.\n")
     fake_path = os.path.join(repository_root, 'PRESUBMIT.py')
     results += executer.ExecPresubmitScript(
-        default_presubmit, fake_path, project)
+        default_presubmit, fake_path, project, change)
   for filename in presubmit_files:
     filename = os.path.abspath(filename)
     if verbose:
       output_stream.write("Running %s\n" % filename)
     # Accept CRLF presubmit script.
     presubmit_script = gclient_utils.FileRead(filename, 'rU')
     results += executer.ExecPresubmitScript(
-        presubmit_script, filename, project)
+        presubmit_script, filename, project, change)
 
   slaves = list(set(results))
   if slaves and verbose:

tests/presubmit_unittest.py

@@ -153,7 +153,7 @@ def testMembersChanged(self):
       'OutputApi', 'ParseFiles', 'PresubmitFailure',
       'PresubmitExecuter', 'PresubmitOutput', 'ScanSubDirs',
       'SvnAffectedFile', 'SvnChange', 'cPickle', 'cStringIO',
-      'fix_encoding', 'fnmatch', 'gclient_utils', 'glob', 'json',
+      'fix_encoding', 'fnmatch', 'gclient_utils', 'glob', 'inspect', 'json',
       'load_files',
       'logging', 'marshal', 'normpath', 'optparse', 'os', 'owners', 'pickle',
       'presubmit_canned_checks', 'random', 're', 'rietveld', 'scm',
@@ -669,11 +669,18 @@ def CheckChangeOnCommit(input_api, output_api):
 
   def testGetTrySlavesExecuter(self):
     self.mox.ReplayAll()
-
+    change = presubmit.Change(
+        'foo',
+        'Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n',
+        self.fake_root_dir,
+        None,
+        0,
+        0,
+        None)
     executer = presubmit.GetTrySlavesExecuter()
-    self.assertEqual([], executer.ExecPresubmitScript('', '', ''))
-    self.assertEqual(
-        [], executer.ExecPresubmitScript('def foo():\n  return\n', '', ''))
+    self.assertEqual([], executer.ExecPresubmitScript('', '', '', change))
+    self.assertEqual([],
+        executer.ExecPresubmitScript('def foo():\n  return\n', '', '', change))
 
     # bad results
     starts_with_space_result = ['  starts_with_space']
@@ -682,7 +689,7 @@ def testGetTrySlavesExecuter(self):
     for result in starts_with_space_result, not_list_result1, not_list_result2:
       self.assertRaises(presubmit.PresubmitFailure,
                         executer.ExecPresubmitScript,
-                        self.presubmit_tryslave % result, '', '')
+                        self.presubmit_tryslave % result, '', '', change)
 
     # good results
     expected_result = ['1', '2', '3']
@@ -692,20 +699,31 @@ def testGetTrySlavesExecuter(self):
       self.assertEqual(
           result,
           executer.ExecPresubmitScript(
-              self.presubmit_tryslave % result, '', ''))
+              self.presubmit_tryslave % result, '', '', change))
 
   def testGetTrySlavesExecuterWithProject(self):
     self.mox.ReplayAll()
 
+    change = presubmit.Change(
+        'foo',
+        'Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n',
+        self.fake_root_dir,
+        None,
+        0,
+        0,
+        None)
+
     executer = presubmit.GetTrySlavesExecuter()
     expected_result1 = ['1', '2']
     expected_result2 = ['a', 'b', 'c']
     script = self.presubmit_tryslave_project % (
         repr('foo'), repr(expected_result1), repr(expected_result2)) 
     self.assertEqual(
-        expected_result1, executer.ExecPresubmitScript(script, '', 'foo'))
+        expected_result1, executer.ExecPresubmitScript(script, '', 'foo',
+                                                       change))
     self.assertEqual(
-        expected_result2, executer.ExecPresubmitScript(script, '', 'bar'))
+        expected_result2, executer.ExecPresubmitScript(script, '', 'bar',
+                                                       change))
 
   def testDoGetTrySlaves(self):
     join = presubmit.os.path.join
@@ -730,13 +748,18 @@ def testDoGetTrySlaves(self):
         self.presubmit_tryslave % '["linux"]')
     self.mox.ReplayAll()
 
+    change = presubmit.Change(
+        'mychange', '', self.fake_root_dir, [], 0, 0, None)
+
     output = StringIO.StringIO()
     self.assertEqual(['win'],
-                     presubmit.DoGetTrySlaves([filename], self.fake_root_dir,
+                     presubmit.DoGetTrySlaves(change, [filename],
+                                              self.fake_root_dir,
                                               None, None, False, output))
     output = StringIO.StringIO()
     self.assertEqual(['win', 'linux'],
-                     presubmit.DoGetTrySlaves([filename, filename_linux],
+                     presubmit.DoGetTrySlaves(change,
+                                              [filename, filename_linux],
                                               self.fake_root_dir, None, None,
                                               False, output))
 

tests/trychange_unittest.py

@@ -59,8 +59,8 @@ class SVNUnittest(TryChangeTestsBase):
   """trychange.SVN tests."""
   def testMembersChanged(self):
     members = [
-      'AutomagicalSettings', 'GetCodeReviewSetting', 'ReadRootFile',
-      'GenerateDiff', 'GetFileNames',
+      'AutomagicalSettings', 'CaptureStatus', 'GetCodeReviewSetting',
+      'ReadRootFile', 'GenerateDiff', 'GetFileNames', 'files', 'file_tuples',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange.SVN, members)
@@ -83,8 +83,8 @@ class GITUnittest(TryChangeTestsBase):
   """trychange.GIT tests."""
   def testMembersChanged(self):
     members = [
-      'AutomagicalSettings', 'GetCodeReviewSetting', 'ReadRootFile',
-      'GenerateDiff', 'GetFileNames',
+      'AutomagicalSettings', 'CaptureStatus', 'GetCodeReviewSetting',
+      'ReadRootFile', 'GenerateDiff', 'GetFileNames', 'files', 'file_tuples',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange.GIT, members)