Bug 883858 - pass disabled tests to the test runner and have them reported in the test log. r=jmaher

This commit is contained in:
Mark Hammond 2013-11-07 10:49:41 +11:00
parent f9421e5961
commit 9b6101f326
2 changed files with 8 additions and 1 deletions

View File

@ -19,6 +19,10 @@ function parseTestManifest(testManifest, params, callback) {
// For mochitest-plain, we define lists as an array of testnames.
for (var obj of testManifest['tests']) {
var path = obj['path'];
if (obj.disabled) {
dump("TEST-SKIPPED | " + path + " | " + obj.disabled + "\n");
continue;
}
if (params.testRoot != 'tests' && params.testRoot !== undefined) {
links[params.baseurl + '/' + params.testRoot + '/' + path] = true
} else {

View File

@ -362,7 +362,10 @@ class MochitestUtilsMixin(object):
if options.testPath and not tp.startswith(options.testPath):
continue
paths.append({'path': tp})
testob = {'path': tp}
if test.has_key('disabled'):
testob['disabled'] = test['disabled']
paths.append(testob)
# Bug 883865 - add this functionality into manifestDestiny
with open('tests.json', 'w') as manifestFile: