Bug 925398 - Refactor runtests.py to follow Mixin pattern, r=jgriffin, followup patch, a=test-only
☠☠ backed out by dfb969af5d44 ☠ ☠
authorMalini Das <mdas@mozilla.com>
Mon, 16 Dec 2013 15:53:03 -0500
changeset 175312 a0b6a681d394ab5c5dcb6d3367c7f82ff3a68a04
parent 175311 aa3cec88b9909c1a278f8461ca80ffd524df414b
child 175313 5cd46f9b875ac9b426e9a9b9495f4c92b3834581
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin, followup, test-only
bugs925398
milestone28.0a2
Bug 925398 - Refactor runtests.py to follow Mixin pattern, r=jgriffin, followup patch, a=test-only
testing/marionette/client/marionette/runner/base.py
testing/marionette/client/marionette/runtests.py
--- a/testing/marionette/client/marionette/runner/base.py
+++ b/testing/marionette/client/marionette/runner/base.py
@@ -790,18 +790,19 @@ class BaseMarionetteTestRunner(object):
 
         testloader = unittest.TestLoader()
         suite = unittest.TestSuite()
 
         if file_ext == '.ini':
             manifest = TestManifest()
             manifest.read(filepath)
 
-            all_tests = manifest.active_tests(disabled=False)
-            manifest_tests = manifest.active_tests(disabled=False,
+            all_tests = manifest.active_tests(exists=False, disabled=False)
+            manifest_tests = manifest.active_tests(exists=False,
+                                                   disabled=False,
                                                    device=self.device,
                                                    app=self.appName)
             skip_tests = list(set([x['path'] for x in all_tests]) -
                               set([x['path'] for x in manifest_tests]))
             for skipped in skip_tests:
                 self.logger.info('TEST-SKIP | %s | device=%s, app=%s' %
                                  (os.path.basename(skipped),
                                   self.device,
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -14,17 +14,17 @@ class MarionetteTestRunner(BaseMarionett
         self.test_handlers = [MarionetteTestCase, MarionetteJSTestCase]
 
 
 def startTestRunner(runner_class, options, tests):
     runner = runner_class(**vars(options))
     runner.run_tests(tests)
     return runner
 
-def cli(runner_class=MarionetteTestRunner, parser_class=MarionetteTestOptions):
+def cli(runner_class=MarionetteTestRunner, parser_class=BaseMarionetteOptions):
     parser = parser_class(usage='%prog [options] test_file_or_dir <test_file_or_dir> ...')
     options, tests = parser.parse_args()
     parser.verify_usage(options, tests)
 
     runner = startTestRunner(runner_class, options, tests)
     if runner.failed > 0:
         sys.exit(10)