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

scripts/slave/swarming/get_swarm_results_shim.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 chromium_utils
 from common import find_depot_tools  # pylint: disable=W0611
 from common import gtest_utils
 
 from slave.swarming import swarming_utils
 
 # 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 85 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 committed.
+  """
+  swarming = os.path.join(client, 'swarming.py')
+  cmd = [
+    sys.executable,
+    swarming,
+    'collect',
+    '--swarming', options.swarming,
+    '--decorate',
+    test_name,
+  ]
+  print('Running: %s' % ' '.join(cmd))
+  proc = subprocess2.Popen(cmd, bufsize=0, stdout=subprocess2.PIPE)
+  gtest_parser = gtest_utils.GTestLogParser()
+  for line in proc.stdout.readlines():
+    line = line.rstrip()
+    print line
+    gtest_parser.ProcessLine(line)
+
+  proc.wait()
+  output, exit_code = gen_summary_output(
+      gtest_parser.FailedTests(),
+      proc.returncode,
+      0)
+  print output
+  return exit_code
+
+
 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 process_build_properties(options, name):
   """Converts build properties and factory properties into expected flags."""
   taskname = '%s-%s-%s' % (
       options.build_properties.get('buildername'),
       options.build_properties.get('buildnumber'),
       name,
   )
   return taskname
@@ skipping 31 matching lines @@
     # Loads the other flags implicitly.
     task_name = process_build_properties(options, args[0])
   else:
     task_name = args[0]
   return determine_version_and_run_handler(client, options, task_name)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main())