Add build slave side support for the new swarming.py script.

scripts/slave/swarming/get_swarm_results.py

 #!/usr/bin/env python
 # Copyright 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.
 
 """Takes in a test name and retrives all the output that the swarm server
 has produced for tests with that name. This is expected to be called as a
 build step.
 """
 
 import optparse
 import os
 import sys
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 from common import find_depot_tools  # pylint: disable=W0611
 from common import gtest_utils
 
 from slave.swarming import swarming_utils
 
-# From depot tools/
+# From depot_tools/
 import fix_encoding
+import subprocess2
 
 
 NO_OUTPUT_FOUND = (
     'No output produced by the test, it may have failed to run.\n'
     'Showing all the output, including swarm specific output.\n'
     '\n')
 
 
 def gen_shard_output(result, gtest_parser):
   """Returns output for swarm shard."""
@@ skipping 82 matching lines @@
     exit_code = max(exit_code, test_exit_code)
 
   output, exit_code = gen_summary_output(
       gtest_parser.FailedTests(),
       exit_code,
       shards_remaining)
   print output
   return exit_code
 
 
+def v0_1(client, options, test_name):
+  """Code starting around r218375.
+
+  TODO(maruel): Put exact revision once committe.d
+  """
+  swarming = os.path.join(client, 'swarming.py')
+  return subprocess2.call(

[M-A Ruel, 2013/08/20 20:22:35]

In practice, this means https://codereview.chromium.org/22980008 should be fixed
to wrap the output nicely.

+      [
+        sys.executable,
+        swarming,
+        'collect',
+        '--swarming', options.swarming,
+        test_name,
+      ])
+
+
 def determine_version_and_run_handler(client, options, test_name):
   """Executes the proper handler based on the code layout and --version
   support.
   """
-  # TODO(maruel): Determine version when needed.
-  return v0(client, options, test_name)
+  if os.path.isfile(os.path.join(client, 'swarm_get_results.py')):
+    # Oh, that's old.
+    return v0(client, options, test_name)
+  return v0_1(client, options, test_name)
 
 
 def main():
   """Note: this is solely to run the current master's code and can totally
   differ from the underlying script flags.
 
   To update these flags:
   - Update the following code to support both the previous flag and the new
     flag.
   - Change scripts/master/factory/swarm_commands.py to pass the new flag.
@@ skipping 14 matching lines @@
   elif len(args) > 1:
     parser.error('Must specify only one test name.')
   options.swarming = options.swarming.rstrip('/')
 
   return determine_version_and_run_handler(client, options, args[0])
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main())