Do not run integration tests on upload, they are too slow.

PRESUBMIT.py

 # Copyright (c) 2011 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 depot tools.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
 details on the presubmit API built into depot_tools.
 """
 
 
-def CommonChecks(input_api, output_api):
+def CommonChecks(input_api, output_api, tests_to_black_list):
   results = []
   import sys
   if not sys.version.startswith('2.5'):
     # Depot_tools has the particularity that it needs to be tested on python
     # 2.5. But we don't want the presubmit check to fail if it is not installed.
     results.append(output_api.PresubmitNotifyResult(
         'You should install python 2.5 and run ln -s $(which python2.5) python.'
         '\n'
         'A great place to put this symlink is in depot_tools.\n'
         'Otherwise, you break depot_tools on python 2.5, you get to keep the '
@@ skipping 11 matching lines @@
       output_api,
       white_list=[r'.*\.py$'],
       black_list=black_list))
 
   # TODO(maruel): Make sure at least one file is modified first.
   # TODO(maruel): If only tests are modified, only run them.
   results.extend(input_api.canned_checks.RunUnitTestsInDirectory(
       input_api,
       output_api,
       'tests',
-      whitelist=[r'.*test\.py$']))
-  results.extend(RunGitClTests(input_api, output_api))
+      whitelist=[r'.*tests\.py$'],
+      blacklist=tests_to_black_list))
   return results
 
 
 def RunGitClTests(input_api, output_api):
   """Run all the shells scripts in the directory test.
   """
   if input_api.platform == 'win32':
     # Skip for now as long as the test scripts are bash scripts.
     return []
 
@@ skipping 32 matching lines @@
       except (OSError, input_api.subprocess.CalledProcessError), e:
         results.append(output_api.PresubmitError('%s failed\n%s' % (test, e)))
   except local_rietveld.Failure, e:
     results.append(output_api.PresubmitError('\n'.join(str(i) for i in e.args)))
   finally:
     server.stop_server()
   return results
 
 
 def CheckChangeOnUpload(input_api, output_api):
-  return CommonChecks(input_api, output_api)
+  # Do not run integration tests on upload since they are way too slow.
+  tests_to_black_list = [
+      r'^checkout_test\.py$',
+      r'^gclient_smoketest\.py$',
+      r'^scm_unittest\.py$',
+    ]
+  return CommonChecks(input_api, output_api, tests_to_black_list)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   output = []
-  output.extend(CommonChecks(input_api, output_api))
+  output.extend(CommonChecks(input_api, output_api, []))
   output.extend(input_api.canned_checks.CheckDoNotSubmit(
       input_api,
       output_api))
+  output.extend(RunGitClTests(input_api, output_api))
   return output