Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1162)

Unified Diff: scripts/slave/swarming/swarming_utils.py

Issue 22909021: Add build slave side support for the new swarming.py script. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: tested to work Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/swarming/get_swarm_results_shim.py ('k') | scripts/slave/swarming/trigger_swarm_shim.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/swarming/swarming_utils.py
diff --git a/scripts/slave/swarming/swarming_utils.py b/scripts/slave/swarming/swarming_utils.py
index b2368da4ed03970985bc63b7b9095d74d932a021..dacc95fb96a415029f61e3f233c587c7f46b0232 100644
--- a/scripts/slave/swarming/swarming_utils.py
+++ b/scripts/slave/swarming/swarming_utils.py
@@ -6,6 +6,12 @@
"""Code to find swarming_client."""
import os
+import sys
+
+from common import find_depot_tools # pylint: disable=W0611
+
+# From depot_tools/
+import subprocess2
def find_client(base_dir):
@@ -24,3 +30,17 @@ def find_client(base_dir):
src_swarm_client = os.path.join(base_dir, 'src', 'tools', 'swarm_client')
if os.path.isdir(src_swarm_client):
return src_swarm_client
+
+
+def get_version(client):
+ """Returns the version of swarming.py client tool, if available."""
+ try:
+ version = subprocess2.check_output(
+ [
+ sys.executable,
+ os.path.join(client, 'swarming.py'),
+ '--version',
+ ])
+ except (subprocess2.CalledProcessError, OSError):
+ return None
+ return map(int, version.split('.'))
Isaac (away) 2013/08/27 01:35:20 This returns a generator -- convert to a list?
M-A Ruel 2013/08/27 12:23:37 http://docs.python.org/2/library/functions.html#ma
Isaac (use chromium) 2013/08/27 17:43:00 Hmm, I must be remembering correctly. Weird. I u
« no previous file with comments | « scripts/slave/swarming/get_swarm_results_shim.py ('k') | scripts/slave/swarming/trigger_swarm_shim.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698