Bug 1286900 - Reformat WPT command argument additions; r?ted draft
authorGregory Szorc <gps@mozilla.com>
Tue, 20 Sep 2016 12:59:19 -0700
changeset 420709 51e9ef03d4eb1c914fbc0c6460d9fe5b8603a796
parent 420708 b56f116c5601a44dd1750d8e600f6769fc0c8975
child 420710 a2d61ab062246e982266cb37df5a235734d953c1
push id31266
push usergszorc@mozilla.com
push dateTue, 04 Oct 2016 13:39:23 +0000
reviewersted
bugs1286900
milestone52.0a1
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"]: