Create proper wrapper scripts to decouple from swarm_client.

scripts/slave/get_swarm_results.py

 #!/usr/bin/env python
 # 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.
 
 """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 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 import trigger_swarm
 
 # From depot tools/
 import fix_encoding
 
 
 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')
 
@@ skipping 69 matching lines @@
 
   output, exit_code = gen_summary_output(
       gtest_parser.FailedTests(),
       exit_code,
       shards_remaining)
   print output
   return exit_code
 
 
 def main():
-  src_swarming_client = os.path.join(
-      os.getcwd(), 'src', 'tools', 'swarming_client')
-
-  # This is the previous path. This can be removed around 2013-12-01.
-  src_swarm_client = os.path.join(os.getcwd(), 'src', 'tools', 'swarm_client')
-
-  if os.path.isdir(src_swarming_client):
-    sys.path.insert(0, src_swarming_client)
-  elif os.path.isdir(src_swarm_client):
-    sys.path.insert(0, src_swarm_client)
-  else:
-    print >> sys.stderr, 'Failed to find swarm_client at %s or %s' % (
-        src_swarming_client, src_swarm_client)
+  client = trigger_swarm.find_swarming_client()
+  if not client:
+    print >> sys.stderr, 'Failed to find swarm(ing)_client'
     return 1
 
+  # TODO(maruel): Do not import, reproduce the same flags and forward to a
+  # subprocess.call() instead.
+  sys.path.insert(0, client)
   import swarm_get_results  # pylint: disable=F0401
 
   parser, options, test_name = swarm_get_results.parse_args()
   if not options.shards:
     parser.error('The number of shards expected must be passed in.')
   test_keys = swarm_get_results.get_test_keys(
       options.url, test_name, options.timeout)
   if not test_keys:
     parser.error('No test keys to get results with.')
 
   options.shards = int(options.shards)
   if options.shards == -1:
     options.shards = len(test_keys)
   elif len(test_keys) < options.shards:
     print >> sys.stderr, ('Warning: Test should have %d shards, but only %d '
                           'test keys were found' % (options.shards,
                                                     len(test_keys)))
 
   return GetSwarmResults(
       swarm_get_results, options.url, test_keys, options.timeout, None)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main())