diff options
author | Caroline Tice <cmtice@google.com> | 2017-04-06 17:16:05 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-04-08 19:40:20 -0700 |
commit | f6ef4395fe1896ba68c80e52cb24763b0fcfe7f8 (patch) | |
tree | 7612123711db98f0746e56b66368d16b388192bd /crosperf/results_cache.py | |
parent | 8c18be1425c8a4ecfc059a7c637fc93f33edab1f (diff) | |
download | toolchain-utils-f6ef4395fe1896ba68c80e52cb24763b0fcfe7f8.tar.gz |
[toolchain-utils] Fix remaining lint errors in toolchain-utils.
In addition to fixing the lint errors, this also fixes the Python
formatting issues (ran tc_pyformat on nearly all the files).
BUG=chromium:570450
TEST=Ran all crosperf & bisect tool unit tests.
Ran afe_lock_machine.py (check machine status)
Ran full crosperf test (octane, speedometer, BootPerf) on alex.
Change-Id: Ic86f9192801ac67769f3de30f1c5f0d203ce0831
Reviewed-on: https://chromium-review.googlesource.com/471886
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Diffstat (limited to 'crosperf/results_cache.py')
-rw-r--r-- | crosperf/results_cache.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py index 29e118e8..04e6590b 100644 --- a/crosperf/results_cache.py +++ b/crosperf/results_cache.py @@ -12,7 +12,6 @@ import pickle import re import tempfile import json -import sys from cros_utils import command_executer from cros_utils import misc @@ -67,9 +66,8 @@ class Result(object): if not os.path.isdir(dest_dir): command = 'mkdir -p %s' % dest_dir self.ce.RunCommand(command) - dest_file = os.path.join(dest_dir, - ('%s.%s' % (os.path.basename(file_to_copy), - file_index))) + dest_file = os.path.join( + dest_dir, ('%s.%s' % (os.path.basename(file_to_copy), file_index))) ret = self.ce.CopyFiles(file_to_copy, dest_file, recursive=False) if ret: raise IOError('Could not copy results file: %s' % file_to_copy) @@ -230,10 +228,10 @@ class Result(object): perf_data_file) perf_report_file = '%s.report' % perf_data_file if os.path.exists(perf_report_file): - raise RuntimeError('Perf report file already exists: %s' % - perf_report_file) - chroot_perf_report_file = misc.GetInsideChrootPath(self.chromeos_root, - perf_report_file) + raise RuntimeError( + 'Perf report file already exists: %s' % perf_report_file) + chroot_perf_report_file = misc.GetInsideChrootPath( + self.chromeos_root, perf_report_file) perf_path = os.path.join(self.chromeos_root, 'chroot', 'usr/bin/perf') perf_file = '/usr/sbin/perf' @@ -366,8 +364,8 @@ class Result(object): self.retval = pickle.load(f) # Untar the tarball to a temporary directory - self.temp_dir = tempfile.mkdtemp( - dir=os.path.join(self.chromeos_root, 'chroot', 'tmp')) + self.temp_dir = tempfile.mkdtemp(dir=os.path.join(self.chromeos_root, + 'chroot', 'tmp')) command = ('cd %s && tar xf %s' % (self.temp_dir, os.path.join(cache_dir, AUTOTEST_TARBALL))) @@ -439,8 +437,8 @@ class Result(object): if ret: command = 'rm -rf {0}'.format(temp_dir) self.ce.RunCommand(command) - raise RuntimeError('Could not move dir %s to dir %s' % - (temp_dir, cache_dir)) + raise RuntimeError('Could not move dir %s to dir %s' % (temp_dir, + cache_dir)) @classmethod def CreateFromRun(cls, |