Bug 1286900 - Reformat WPT command argument additions; r=ted
☠☠ backed out by cda7c3e91ad7 ☠ ☠
authorGregory Szorc <gps@mozilla.com>
Tue, 20 Sep 2016 12:59:19 -0700
changeset 316399 2de97e3cfcb3aad58312dc4e27be960025a312a6
parent 316398 43df1e962f8e833babb0bf1d71fc33d77be9f0a9
child 316400 a1311218621b1f23ffa8a4f8167e643155c0d837
push id30770
push userkwierso@gmail.com
push dateWed, 05 Oct 2016 00:00:48 +0000
treeherdermozilla-central@3470e326025c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1286900
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
testing/mozharness/scripts/web_platform_tests.py
--- 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"]: