Move swarm_client to swarming_client.

This involves fixing up all the calling side. It now fetched from
a clone of code.google.com/p/swarming.client instead of chrome/trunk/tools/swarm_client.

Always fetch from https://chromium.googlesource.com since it has much higher reliability.

TBR=vadimsh@chromium.org
BUG=
NOTRY=true

Review URL: https://codereview.chromium.org/20457002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217535 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 49 insertions, 47 deletions

diff --git a/.gitignore b/.gitignore
index c387610..33e42c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -304,7 +304,7 @@ v8.log
 /tools/page_cycler/acid3
 /tools/perf/data
 /tools/perf/results.html
-/tools/swarm_client
+/tools/swarming_client
 /tools/tryserver
 /tools/win/link_limiter/build
 /ui/surface/surface.xml
diff --git a/DEPS b/DEPS
index 9008260..333a712 100644
--- a/DEPS
+++ b/DEPS
@@ -42,9 +42,9 @@ vars = {
   "jsoncpp_revision": "248",
   "nss_revision": "209026",
   # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling swarm_client
+  # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
-  "swarm_revision": "217028",
+  "swarming_revision": "51336a32732d4eea3f07e44e4a62c4d8103ef29f",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling openssl
   # and whatever else without interference from each other.
@@ -105,8 +105,10 @@ deps = {
   "src/tools/gyp":
     (Var("googlecode_url") % "gyp") + "/trunk@1693",
 
-  "src/tools/swarm_client":
-    "/trunk/tools/swarm_client@" + Var("swarm_revision"),
+  # It is a git clone of https://code.google.com/p/swarming.client.
+  "src/tools/swarming_client":
+    Var("chromium_git") + "/external/swarming.client.git@" +
+      Var("swarming_revision"),
 
   "src/v8":
     (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index 852997b..cfc0e94 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -16,7 +16,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,8 +29,8 @@
       'variables': {
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/run_isolated.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
@@ -39,7 +39,7 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 2e70dd0..4da3bd0 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -66,7 +66,7 @@ _DEPS_EXCLUSION_LIST = [
 ]
 
 _ISOLATE_SCRIPT = os.path.join(
-    constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py')
+    constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py')
 
 
 def _GenerateDepsDirUsingIsolate(suite_name, build_type):
diff --git a/build/common.gypi b/build/common.gypi
index e95efab..c0bbcca 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -677,7 +677,7 @@
         # Whether tests targets should be run, archived or just have the
         # dependencies verified. All the tests targets have the '_run' suffix,
         # e.g. base_unittests_run runs the target base_unittests. The test
-        # target always calls tools/swarm_client/isolate.py. See the script's
+        # target always calls tools/swarming_client/isolate.py. See the script's
         # --help for more information and the valid --mode values. Meant to be
         # overriden with GYP_DEFINES.
         # TODO(maruel): Remove the conditions as more configurations are
diff --git a/build/isolate.gypi b/build/isolate.gypi
index 15fcf4c..312cc48 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -41,12 +41,12 @@
       'extension': 'isolate',
       'inputs': [
         # Files that are known to be involved in this step.
-        '<(DEPTH)/tools/swarm_client/isolate.py',
-        '<(DEPTH)/tools/swarm_client/isolateserver_archive.py',
-        '<(DEPTH)/tools/swarm_client/run_isolated.py',
-        '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py',
-        '<(DEPTH)/tools/swarm_client/short_expression_finder.py',
-        '<(DEPTH)/tools/swarm_client/trace_inputs.py',
+        '<(DEPTH)/tools/swarming_client/isolate.py',
+        '<(DEPTH)/tools/swarming_client/isolateserver_archive.py',
+        '<(DEPTH)/tools/swarming_client/run_isolated.py',
+        '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py',
+        '<(DEPTH)/tools/swarming_client/short_expression_finder.py',
+        '<(DEPTH)/tools/swarming_client/trace_inputs.py',
 
         # Disable file tracking by the build driver for now. This means the
         # project must have the proper build-time dependency for their runtime
@@ -67,7 +67,7 @@
         ["test_isolation_outdir==''", {
           'action': [
             'python',
-            '<(DEPTH)/tools/swarm_client/isolate.py',
+            '<(DEPTH)/tools/swarming_client/isolate.py',
             '<(test_isolation_mode)',
             # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot
             # be provided twice. To work around this behavior, append '/'.
@@ -87,7 +87,7 @@
         }, {
           'action': [
             'python',
-            '<(DEPTH)/tools/swarm_client/isolate.py',
+            '<(DEPTH)/tools/swarming_client/isolate.py',
             '<(test_isolation_mode)',
             '--outdir', '<(test_isolation_outdir)',
             # See comment above.
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 79ffdc0..aa8d71c 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -8,7 +8,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '--use-less-jobs',
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
         ],
@@ -44,8 +44,8 @@
           '../media/test/data/sfx.ogg',
           '../ppapi/tests/test_case.html',
           '../ppapi/tests/test_page.css',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/run_isolated.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf',
@@ -129,7 +129,7 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '--use-less-jobs',
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
         ],
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 554fdd0..acd442c 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -8,7 +8,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '-j1',
           '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
         ],
@@ -32,8 +32,8 @@
           '../net/tools/testserver/testserver.py',
           '../net/tools/testserver/testserver_base.py',
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/run_isolated.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/resources.pak',
         ],
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 30fd0a5..dbdc595 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -8,7 +8,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -45,8 +45,8 @@
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/run_isolated.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
         ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/pyproto/',
@@ -56,7 +56,7 @@
     ['OS=="mac"', {
       'variables': {
         'command': [
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 59b789d..c1def93 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -44,7 +44,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -62,8 +62,8 @@
       'variables': {
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/run_isolated.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
           'browser/safe_browsing/two_phase_testserver.py',
         ],
@@ -90,7 +90,7 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index 55b0f56..b66e064 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -26,7 +26,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -45,8 +45,8 @@
       'variables': {
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/run_isolated.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
@@ -77,7 +77,7 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 94e3863..87b0319 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -24,7 +24,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -53,7 +53,7 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 71a2dc0..813181d 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -21,7 +21,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -34,8 +34,8 @@
       'variables': {
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/run_isolated.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
@@ -51,7 +51,7 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
+          '../tools/swarming_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/tools/sharding_supervisor/sharding_supervisor.py b/tools/sharding_supervisor/sharding_supervisor.py
index 4bddeb2..54daa3c 100755
--- a/tools/sharding_supervisor/sharding_supervisor.py
+++ b/tools/sharding_supervisor/sharding_supervisor.py
@@ -60,9 +60,9 @@ def main():
   parser.disable_interspersed_args()
   options, args = parser.parse_args()
 
-  swarm_client_dir = os.path.join(
-      ROOT_DIR, 'tools', 'swarm_client', 'googletest')
-  sys.path.insert(0, swarm_client_dir)
+  swarming_client_dir = os.path.join(
+      ROOT_DIR, 'tools', 'swarming_client', 'googletest')
+  sys.path.insert(0, swarming_client_dir)
 
   cmd = [
     '--shards', str(options.total_slaves),