Bug 1415692 - Don't enforce runByManifest for `prefs` in manifests on disabled tests. r=ahal
MozReview-Commit-ID: Fd9laiSVJwa
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1496,17 +1496,17 @@ toolbar#nav-bar {
'Warning: %s from manifest %s is not a valid test' %
(test['name'], test['manifest']))
continue
manifest_relpath = os.path.relpath(test['manifest'], manifest_root)
self.tests_by_manifest[manifest_relpath].append(tp)
self.prefs_by_manifest[manifest_relpath].add(test.get('prefs'))
- if 'prefs' in test and not options.runByManifest:
+ if 'prefs' in test and not options.runByManifest and 'disabled' not in test:
self.log.error("parsing {}: runByManifest mode must be enabled to "
"set the `prefs` key".format(manifest_relpath))
sys.exit(1)
testob = {'path': tp, 'manifest': manifest_relpath}
if 'disabled' in test:
testob['disabled'] = test['disabled']
if 'expected' in test: