Bug 758834 - Add ability to flag tests to be skipped in manifest, a=test-only, DONTBUILD because NPOTB
authorJonathan Griffin <jgriffin@mozilla.com>
Fri, 25 May 2012 16:51:23 -0700
changeset 94951 c3f6681b98770c197704654095c219e2939ab050
parent 94950 e4574b46f0ba7999521cb1704de2eac75b017687
child 94952 bcb614c5e7faca477efde5e19dc13f3da36d8277
push id22768
push userjgriffin@mozilla.com
push dateFri, 25 May 2012 23:51:50 +0000
treeherdermozilla-central@c3f6681b9877 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only, DONTBUILD
bugs758834
milestone15.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 758834 - Add ability to flag tests to be skipped in manifest, a=test-only, DONTBUILD because NPOTB
testing/marionette/client/marionette/runtests.py
testing/marionette/client/marionette/tests/unit-tests.ini
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -290,33 +290,30 @@ class MarionetteTestRunner(object):
             return
 
         mod_name,file_ext = os.path.splitext(os.path.split(filepath)[-1])
 
         testloader = unittest.TestLoader()
         suite = unittest.TestSuite()
 
         if file_ext == '.ini':
+            testargs = { 'skip': 'false' }
             if testtype is not None:
-                testargs = {}
                 testtypes = testtype.replace('+', ' +').replace('-', ' -').split()
                 for atype in testtypes:
                     if atype.startswith('+'):
                         testargs.update({ atype[1:]: 'true' })
                     elif atype.startswith('-'):
                         testargs.update({ atype[1:]: 'false' })
                     else:
                         testargs.update({ atype: 'true' })
+
             manifest = TestManifest()
             manifest.read(filepath)
-
-            if testtype is None:
-                manifest_tests = manifest.get()
-            else:
-                manifest_tests = manifest.get(**testargs)
+            manifest_tests = manifest.get(**testargs)
 
             for i in manifest_tests:
                 self.run_test(i["path"], testtype)
             return
 
         self.logger.info('TEST-START %s' % os.path.basename(test))
 
         if file_ext == '.py':
--- a/testing/marionette/client/marionette/tests/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit-tests.ini
@@ -3,15 +3,18 @@
 qemu = false
 
 ; true if the test is compatible with the browser, otherwise false
 browser = true
 
 ; true if the test is compatible with b2g, otherwise false
 b2g = true
 
+; true if the test should be skipped
+skip = false
+
 ; webapi tests
 [include:../../../../../dom/telephony/test/marionette/manifest.ini]
 [include:../../../../../dom/battery/test/marionette/manifest.ini]
 [include:../../../../../dom/sms/tests/manifest.ini]
 
 ; marionette unit tests
 [include:unit/unit-tests.ini]