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

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

Issue 2014063002: Run format-webkit on webkitpy code (without string conversion). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 7 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
Index: third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py b/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
index abfdf152625d80b649c02e35ef9f2b0501610b79..07a4e64d2a68632f5f44127b13b20fdb3b1d47fb 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
@@ -157,7 +157,8 @@ class PerfTestsRunner(object):
tests = []
for path in test_files:
relative_path = filesystem.relpath(path, self._base_path).replace('\\', '/')
- if self._options.use_skipped_list and self._port.skips_perf_test(relative_path) and filesystem.normpath(relative_path) not in paths:
+ if self._options.use_skipped_list and self._port.skips_perf_test(
+ relative_path) and filesystem.normpath(relative_path) not in paths:
continue
test = PerfTestFactory.create_perf_test(self._port, relative_path, path,
test_runner_count=self._options.test_runner_count)
@@ -319,7 +320,7 @@ class PerfTestsRunner(object):
for key in slave_config:
contents['builder' + key.capitalize()] = slave_config[key]
return contents
- except Exception, error:
+ except Exception as error:
_log.error("Failed to merge slave configuration JSON file %s: %s" % (slave_config_json_path, error))
return None
@@ -329,7 +330,7 @@ class PerfTestsRunner(object):
try:
existing_outputs = json.loads(self._host.filesystem.read_text_file(output_json_path))
return existing_outputs + [output]
- except Exception, error:
+ except Exception as error:
_log.error("Failed to merge output JSON file %s: %s" % (output_json_path, error))
return None
@@ -338,7 +339,7 @@ class PerfTestsRunner(object):
uploader = file_uploader(url, 120)
try:
response = uploader.upload_single_text_file(self._host.filesystem, 'application/json', json_path)
- except Exception, error:
+ except Exception as error:
_log.error("Failed to upload JSON file to %s in 120s: %s" % (url, error))
return False

Powered by Google App Engine
This is Rietveld 408576698