Bug 1231806 - Fix abnormal blank lines quantity. r=ted
authorSimon Gareste <simon@gareste.fr>
Mon, 28 Dec 2015 03:23:37 -0500
changeset 278297 f6fe454687d5ff9d5116b970e770cf41839624f7
parent 278296 64191519db53ef052ad1442259ba76419c7c3ce1
child 278298 f8a7896caec003bb590b721533bf6be62c6bb825
push id69723
push usercbook@mozilla.com
push dateMon, 04 Jan 2016 08:15:55 +0000
treeherdermozilla-inbound@f8a7896caec0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1231806
milestone46.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 1231806 - Fix abnormal blank lines quantity. r=ted
testing/mochitest/mach_commands.py
testing/mochitest/runtestsb2g.py
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -343,16 +343,17 @@ class MochitestRunner(MozbuildObject):
             manifest = TestManifest()
             manifest.tests.extend(tests)
             options.manifestFile = manifest
 
         return runrobocop.run_test_harness(options)
 
 # parser
 
+
 def setup_argument_parser():
     build_obj = MozbuildObject.from_environment(cwd=here)
 
     build_path = os.path.join(build_obj.topobjdir, 'build')
     if build_path not in sys.path:
         sys.path.append(build_path)
 
     mochitest_dir = os.path.join(build_obj.topobjdir, '_tests', 'testing', 'mochitest')
--- a/testing/mochitest/runtestsb2g.py
+++ b/testing/mochitest/runtestsb2g.py
@@ -359,17 +359,16 @@ class MochitestB2G(MochitestBase):
         # causes manifestFile not to be set
         if "manifestFile=tests.json" not in self.urlOpts:
             self.urlOpts.append("manifestFile=%s" % options.manifestFile)
 
         if len(self.urlOpts) > 0:
             test_url += "?" + "&".join(self.urlOpts)
         self.test_script_args.append(test_url)
 
-
         options.profilePath = self.app_ctx.remote_profile
         options.logFile = self.local_log
 
 
 def run_test_harness(options):
     # create our Marionette instance
     marionette_args = {
         'adb_path': options.adbPath,