Split up Each Swarm Test into Two Steps

PRESUBMIT.py

 # 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.
 
 """Top-level presubmit script for buildbot.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
 details on the presubmit API built into gcl.
 """
 
@@ skipping 22 matching lines @@
         join('third_party', 'mock-0.7.2'),
         join('third_party', 'sqlalchemy_0_7_1'),
         join('third_party', 'sqlalchemy_migrate_0_7_1'),
         join('third_party', 'tempita_0_5'),
         join('third_party', 'twisted_10_2'),
         join('scripts'),
         # Initially, a separate run was done for unit tests but now that
         # pylint is fetched in memory with setuptools, it seems it caches
         # sys.path so modifications to sys.path aren't kept.
         join('scripts', 'master', 'unittests'),
+        join('scripts', 'slave', 'unittests'),
         join('site_config'),
         join('test'),
     ] + sys.path
 
     output.extend(input_api.canned_checks.RunPylint(
         input_api,
         output_api,
         black_list=black_list))
   finally:
     sys.path = sys_path_backup
 
   if input_api.is_committing:
     output.extend(input_api.canned_checks.PanProjectChecks(
       input_api, output_api, excluded_paths=black_list))
   return output
 
 
 def RunTests(input_api, output_api):
   out = []
   whitelist = [r'.+_test\.py$']
   out.extend(input_api.canned_checks.RunUnitTestsInDirectory(
       input_api, output_api, 'test', whitelist))
   out.extend(input_api.canned_checks.RunUnitTestsInDirectory(
       input_api,
       output_api,
       input_api.os_path.join('scripts', 'master', 'unittests'),
       whitelist))
+  out.extend(input_api.canned_checks.RunUnitTestsInDirectory(
+      input_api,
+      output_api,
+      input_api.os_path.join('scripts', 'slave', 'unittests'),
+      whitelist))
   internal_path = input_api.os_path.join('..', 'build_internal', 'test')
   if input_api.os_path.isfile(internal_path):
     out.extend(input_api.canned_checks.RunUnitTestsInDirectory(
         input_api, output_api, internal_path, whitelist))
   return out
 
 
 def CheckChangeOnUpload(input_api, output_api):
   return CommonChecks(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   output = []
   output.extend(CommonChecks(input_api, output_api))
   output.extend(RunTests(input_api, output_api))
   return output