Bug 1056329 - Activate structured logging command line args for other mochitest suites. r=ahal
authorAhmed Kachkach <ahmed.kachkach@gmail.com>
Mon, 25 Aug 2014 12:32:00 -0400
changeset 223600 b666f357e0c64eb1f457cd0f92857cd999270d5e
parent 223599 cb96975c76817d0a2867a90a4076e2174d5aa934
child 223601 a55aa9792ca6c205ffcfef87721b0676c9382c6d
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1056329
milestone34.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 1056329 - Activate structured logging command line args for other mochitest suites. r=ahal
testing/mochitest/mach_commands.py
testing/mochitest/runtests.py
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -621,66 +621,74 @@ class MachCommands(MachCommandBase):
         description='Run a plain mochitest (integration test, plain web page).',
         parser=_st_parser)
     @MochitestCommand
     def run_mochitest_plain(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'plain', **kwargs)
 
     @Command('mochitest-chrome', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run a chrome mochitest (integration test with some XUL).')
+        description='Run a chrome mochitest (integration test with some XUL).',
+        parser=_st_parser)
     @MochitestCommand
     def run_mochitest_chrome(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'chrome', **kwargs)
 
     @Command('mochitest-browser', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run a mochitest with browser chrome (integration test with a standard browser).')
+        description='Run a mochitest with browser chrome (integration test with a standard browser).',
+        parser=_st_parser)
     @MochitestCommand
     def run_mochitest_browser(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'browser', **kwargs)
 
     @Command('mochitest-devtools', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run a devtools mochitest with browser chrome (integration test with a standard browser with the devtools frame).')
+        description='Run a devtools mochitest with browser chrome (integration test with a standard browser with the devtools frame).',
+        parser=_st_parser)
     @MochitestCommand
     def run_mochitest_devtools(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'devtools', **kwargs)
 
     @Command('mochitest-metro', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run a mochitest with metro browser chrome (tests for Windows touch interface).')
+        description='Run a mochitest with metro browser chrome (tests for Windows touch interface).',
+        parser=_st_parser)
     @MochitestCommand
     def run_mochitest_metro(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'metro', **kwargs)
 
     @Command('mochitest-a11y', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run an a11y mochitest (accessibility tests).')
+        description='Run an a11y mochitest (accessibility tests).',
+        parser=_st_parser)
     @MochitestCommand
     def run_mochitest_a11y(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'a11y', **kwargs)
 
     @Command('webapprt-test-chrome', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run a webapprt chrome mochitest (Web App Runtime with the browser chrome).')
+        description='Run a webapprt chrome mochitest (Web App Runtime with the browser chrome).',
+        parser=_st_parser)
     @MochitestCommand
     def run_mochitest_webapprt_chrome(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'webapprt-chrome', **kwargs)
 
     @Command('webapprt-test-content', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run a webapprt content mochitest (Content rendering of the Web App Runtime).')
+        description='Run a webapprt content mochitest (Content rendering of the Web App Runtime).',
+        parser=_st_parser)
     @MochitestCommand
     def run_mochitest_webapprt_content(self, test_paths, **kwargs):
         return self.run_mochitest(test_paths, 'webapprt-content', **kwargs)
 
     @Command('mochitest', category='testing',
         conditions=[conditions.is_firefox],
-        description='Run any flavor of mochitest (integration test).')
+        description='Run any flavor of mochitest (integration test).',
+        parser=_st_parser)
     @MochitestCommand
     @CommandArgument('-f', '--flavor', choices=FLAVORS.keys(),
         help='Only run tests of this flavor.')
     def run_mochitest_general(self, test_paths, flavor=None, test_objects=None,
             **kwargs):
         self._preruntest()
 
         from mozbuild.testing import TestResolver
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2014,17 +2014,17 @@ class Mochitest(MochitestUtilsMixin):
   def makeTestConfig(self, options):
     "Creates a test configuration file for customizing test execution."
     options.logFile = options.logFile.replace("\\", "\\\\")
     options.testPath = options.testPath.replace("\\", "\\\\")
 
     if "MOZ_HIDE_RESULTS_TABLE" in os.environ and os.environ["MOZ_HIDE_RESULTS_TABLE"] == "1":
       options.hideResultsTable = True
 
-    d = dict(options.__dict__)
+    d = dict((k, v) for k, v in options.__dict__.iteritems() if not k.startswith('log'))
     d['testRoot'] = self.testRoot
     content = json.dumps(d)
 
     with open(os.path.join(options.profilePath, "testConfig.js"), "w") as config:
       config.write(content)
 
   def getTestManifest(self, options):
     if isinstance(options.manifestFile, TestManifest):