Bug 1415692 - Don't enforce runByManifest for `prefs` in manifests on disabled tests. r=ahal a=jcristau
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Tue, 05 Dec 2017 15:45:21 -0800
changeset 442811 2b215d1288330380fdb3dfc6102032e83cd2e5a2
parent 442810 3c0c4b0d577fa418f3a7cc755d129ddb130f1d4c
child 442812 451e4043cf56fae975fa887f2646fbdd9f4e8222
push id8345
push userbtara@mozilla.com
push dateThu, 07 Dec 2017 14:34:46 +0000
treeherdermozilla-beta@58f61575432c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal, jcristau
bugs1415692
milestone58.0
Bug 1415692 - Don't enforce runByManifest for `prefs` in manifests on disabled tests. r=ahal a=jcristau MozReview-Commit-ID: Fd9laiSVJwa
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1479,17 +1479,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: