Bug 1286900 - Reformat WPT command argument additions; r=ted
☠☠ backed out by aed585286446 ☠ ☠
authorGregory Szorc <gps@mozilla.com>
Tue, 20 Sep 2016 12:59:19 -0700
changeset 315353 5b0f69c86028c974b83717b5f67e6d240d13f1ce
parent 315352 01c3527edde5d90114b72e52e5890b43e6ba15cb
child 315354 3928e945b584cb4efd837fcd0bb55fca88f3a656
push id30748
push usercbook@mozilla.com
push dateWed, 28 Sep 2016 13:53:19 +0000
treeherdermozilla-central@8c84b7618840 [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
@@ -126,24 +126,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"]: