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

tools/gen_bench_expectations_from_codereview.py

 #!/usr/bin/python
 
 # Copyright (c) 2014 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.
 
 
 """Generate new bench expectations from results of trybots on a code review."""
 
 
 import collections
 import compare_codereview
 import json
 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
 BUILD_STATUS_WARNINGS = 1
 CHECKOUT_PATH = os.path.realpath(os.path.join(
     os.path.dirname(os.path.abspath(__file__)), os.pardir))
 TMP_BENCH_DATA_DIR = os.path.join(CHECKOUT_PATH, '.bench_data')
 
 
 TryBuild = collections.namedtuple(
@@ skipping 58 matching lines @@
 
 def get_bench_data(builder, build_num, dest_dir):
   """Download the bench data for the given builder at the given build_num.
 
   Args:
       builder: string; name of the builder.
       build_num: string; build number.
       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):
   """Finds the revision at which the downloaded data was generated.
 
   Args:
       dest_dir: string; directory holding the downloaded data.
 
   Returns:
       The revision (git commit hash) at which the downloaded data was
@@ skipping 80 matching lines @@
     if try_builder in failed_run:
       continue
 
     builder = try_builder.replace('-Trybot', '')
 
     # Download the data.
     dest_dir = os.path.join(TMP_BENCH_DATA_DIR, builder)
     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
 
     # Find the revision at which the data was generated.
     revision = find_revision_from_downloaded_data(dest_dir)
     if not revision:
       # If we can't find a revision, then something is wrong with the data we
       # downloaded. Skip this builder.
       failed_data_pull.append(try_builder)
       continue
 
     # Generate new expectations.
     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 = ''
   if failed_data_pull:
     failure += 'Failed to load data for: %s\n\n' % ','.join(failed_data_pull)
   if failed_gen_expectations:
     failure += 'Failed to generate expectations for: %s\n\n' % ','.join(
         failed_gen_expectations)
   if failure:
     raise Exception(failure)
 
 
 if __name__ == '__main__':
   gen_bench_expectations_from_codereview(sys.argv[1])