Presubmit: Always run recipe test and gen_tasks test on commit

PRESUBMIT.py

 # Copyright (c) 2013 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.
 
 
 """Top-level presubmit script for Skia.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
@@ skipping 152 matching lines @@
                        'nanobench_flags.py' in x.LocalPath())
   for f in input_api.AffectedSourceFiles(sources):
     if 0 != subprocess.call(['python', f.LocalPath(), 'test']):
       results.append(output_api.PresubmitError('`python %s test` failed' % f))
   return results
 
 
 def _RecipeSimulationTest(input_api, output_api):
   """Run the recipe simulation test."""
   results = []
-  if not any(f.LocalPath().startswith('infra')
-             for f in input_api.AffectedFiles()):
-    return results
-
   recipes_py = os.path.join('infra', 'bots', 'recipes.py')
   cmd = ['python', recipes_py, 'simulation_test']
   try:
+    input_api.logging.debug('Running: %s' % ' '.join(cmd))
     subprocess.check_output(cmd)
   except subprocess.CalledProcessError as e:
     results.append(output_api.PresubmitError(
         '`%s` failed:\n%s' % (' '.join(cmd), e.output)))
   return results
 
 
 def _GenTasksTest(input_api, output_api):
   """Run gen_tasks.go test."""
   results = []
-  if not any(f.LocalPath().startswith('infra')
-             for f in input_api.AffectedFiles()):
+
+  # Update the infra Go packages.
+  cmd = ['go', 'get', '-u', 'go.skia.org/infra/...']
+  try:
+    subprocess.check_call(cmd)
+  except subprocess.CalledProcessError as e:
+    results.append(output_api.PresubmitError(
+        'Failed to run %s: %s' % (' '.join(cmd), e)))
+    return results
+  except os.OSError:
+    results.append(output_api.PresubmitError(
+        'Failed to run "%s"; is Go installed?' % ' '.join(cmd)))
     return results
 
+  # Run gen_tasks.go --test.
   gen_tasks = os.path.join('infra', 'bots', 'gen_tasks.go')
   cmd = ['go', 'run', gen_tasks, '--test']
   try:
+    input_api.logging.debug('Running: %s' % ' '.join(cmd))
     subprocess.check_output(cmd)
   except subprocess.CalledProcessError as e:
     results.append(output_api.PresubmitError(
         '`%s` failed:\n%s' % (' '.join(cmd), e.output)))
   return results
 
 
 def _CheckGNFormatted(input_api, output_api):
   """Make sure any .gn files we're changing have been formatted."""
   results = []
@@ skipping 37 matching lines @@
 
 
 def CheckChangeOnUpload(input_api, output_api):
   """Presubmit checks for the change on upload.
 
   The following are the presubmit checks:
   * Check change has one and only one EOL.
   """
   results = []
   results.extend(_CommonChecks(input_api, output_api))
-  # Run on upload, not commit, since the presubmit bot apparently doesn't have
-  # coverage or Go installed.
-  results.extend(_RecipeSimulationTest(input_api, output_api))
-  results.extend(_GenTasksTest(input_api, output_api))
+
+  # On upload, only run these checks if something in the 'infra' dir changed.
+  if any(f.LocalPath().startswith('infra')
+         for f in input_api.AffectedFiles()):
+    results.extend(_RecipeSimulationTest(input_api, output_api))
+    results.extend(_GenTasksTest(input_api, output_api))
 
   results.extend(_CheckGNFormatted(input_api, output_api))
   return results
 
 
 def _CheckTreeStatus(input_api, output_api, json_url):
   """Check whether to allow commit.
 
   Args:
     input_api: input related apis.
@@ skipping 373 matching lines @@
     http://skia-tree-status.appspot.com/. Shows a warning if it is in 'Caution'
     state and an error if it is in 'Closed' state.
   """
   results = []
   results.extend(_CommonChecks(input_api, output_api))
   results.extend(
       _CheckTreeStatus(input_api, output_api, json_url=(
           SKIA_TREE_STATUS_URL + '/banner-status?format=json')))
   results.extend(_CheckLGTMsForPublicAPI(input_api, output_api))
   results.extend(_CheckOwnerIsInAuthorsFile(input_api, output_api))
+  results.extend(_RecipeSimulationTest(input_api, output_api))
+  results.extend(_GenTasksTest(input_api, output_api))
   return results