Bug 758834 - Add ability to flag tests to be skipped in manifest, a=test-only, DONTBUILD because NPOTB

This commit is contained in:
Jonathan Griffin 2012-05-25 16:51:23 -07:00
parent ae83322320
commit 66ec1382d4
2 changed files with 6 additions and 6 deletions

View File

@ -295,8 +295,8 @@ class MarionetteTestRunner(object):
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('+'):
@ -305,13 +305,10 @@ class MarionetteTestRunner(object):
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)

View File

@ -8,6 +8,9 @@ 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]