commit 4621788761e35c3279fbd4efd5b02542eac192b3
author borenet <borenet@google.com> Wed Jul 02 12:52:34 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 02 12:52:34 2014 -0700
tree f01da675bc4cb663bb26e9010d63080d4d046a65
parent 3fa56b322acd1fc722124f349d155fc29d8500cc

gen_bench_expectations: use subprocess instead of shell_utils due to buildbot-side name collision

BUG=skia:2714
R=rmistry@google.com
TBR=rmistry
NOTRY=true

Author: borenet@google.com

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

tools/gen_bench_expectations_from_codereview.py

diff --git a/tools/gen_bench_expectations_from_codereview.py b/tools/gen_bench_expectations_from_codereview.py
index 4c41c9a..f0463fe 100644
--- a/tools/gen_bench_expectations_from_codereview.py
+++ b/tools/gen_bench_expectations_from_codereview.py
@@ -14,12 +14,10 @@
 import os
 import re
 import shutil
+import subprocess
 import sys
 import urllib2
 
-import fix_pythonpath  # pylint: disable=W0611
-from common.py.utils import shell_utils
-
 
 BENCH_DATA_URL = 'gs://chromium-skia-gm/perfdata/%s/%s/bench_*_data_*'
 BUILD_STATUS_SUCCESS = 0
@@ -98,7 +96,7 @@
       dest_dir: string; destination directory for the bench data.
   """
   url = BENCH_DATA_URL % (builder, build_num)
-  shell_utils.run(['gsutil', 'cp', '-R', url, dest_dir])
+  subprocess.check_call(['gsutil', 'cp', '-R', url, dest_dir])
 
 
 def find_revision_from_downloaded_data(dest_dir):
@@ -199,7 +197,7 @@
     os.makedirs(dest_dir)
     try:
       get_bench_data(try_builder, try_build.build_number, dest_dir)
-    except shell_utils.CommandFailedException:
+    except subprocess.CalledProcessError:
       failed_data_pull.append(try_builder)
       continue
 
@@ -215,12 +213,12 @@
     output_file = os.path.join(CHECKOUT_PATH, 'expectations', 'bench',
                                'bench_expectations_%s.txt' % builder)
     try:
-      shell_utils.run(['python',
-                       os.path.join(CHECKOUT_PATH, 'bench',
-                                    'gen_bench_expectations.py'),
-                       '-b', builder, '-o', output_file,
-                       '-d', dest_dir, '-r', revision])
-    except shell_utils.CommandFailedException:
+      subprocess.check_call(['python',
+                             os.path.join(CHECKOUT_PATH, 'bench',
+                                          'gen_bench_expectations.py'),
+                             '-b', builder, '-o', output_file,
+                             '-d', dest_dir, '-r', revision])
+    except subprocess.CalledProcessError:
       failed_gen_expectations.append(builder)
 
   failure = ''