Bug 1286900 - Reformat WPT command argument additions; r?ted
list.extend() is favored over +=. Also use single quotes, fixup
indentation, and factor out a common variable.
MozReview-Commit-ID: 3qVDGrkYhVe
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -130,24 +130,27 @@ class WebPlatformTest(TestingMixin, Merc
cmd = [self.query_python_path('python'), '-u']
cmd.append(os.path.join(dirs["abs_wpttest_dir"], run_file_name))
# Make sure that the logging directory exists
if self.mkdir_p(dirs["abs_blob_upload_dir"]) == -1:
self.fatal("Could not create blobber upload directory")
# Exit
- cmd += ["--log-raw=-",
- "--log-raw=%s" % os.path.join(dirs["abs_blob_upload_dir"],
- "wpt_raw.log"),
- "--log-errorsummary=%s" % os.path.join(dirs["abs_blob_upload_dir"],
- "wpt_errorsummary.log"),
- "--binary=%s" % self.binary_path,
- "--symbols-path=%s" % self.query_symbols_url(),
- "--stackwalk-binary=%s" % self.query_minidump_stackwalk()]
+ blob_upload_dir = dirs['abs_blob_upload_dir']
+
+ cmd.extend([
+ '--log-raw=-',
+ '--log-raw=%s' % os.path.join(blob_upload_dir, 'wpt_raw.log'),
+ '--log-errorsummary=%s' % os.path.join(blob_upload_dir,
+ 'wpt_errorsummary.log'),
+ '--binary=%s' % self.binary_path,
+ '--symbols-path=%s' % self.query_symbols_url(),
+ '--stackwalk-binary=%s' % self.query_minidump_stackwalk(),
+ ])
for test_type in c.get("test_type", []):
cmd.append("--test-type=%s" % test_type)
if not c["e10s"]:
cmd.append("--disable-e10s")
for opt in ["total_chunks", "this_chunk"]: