Bug 1773523 - allow_xul_xbl support in manifests. r=mccr8,gbrown

Differential Revision: https://phabricator.services.mozilla.com/D148681

dom/html/test/mochitest.ini

@@ -264,6 +264,7 @@ skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
 [test_bug448166.html]
 [test_bug456229.html]
 [test_bug458037.xhtml]
+allow_xul_xbl = true
 [test_bug460568.html]
 [test_bug481335.xhtml]
 skip-if = toolkit == 'android' #TIMED_OUT
@@ -438,6 +439,7 @@ skip-if = toolkit == 'android' #TIMED_OUT
 skip-if = toolkit == 'android'
 [test_formelements.html]
 [test_fullscreen-api.html]
+allow_xul_xbl = true  # XUL is used in file_fullscreen-api.html
 tags = fullscreen
 skip-if =
   toolkit == 'android'

image/test/mochitest/mochitest.ini

@@ -165,4 +165,5 @@ disabled = bug 1295501
 [test_undisplayed_iframe.html]
 [test_webcam.html]
 [test_xultree_animation.xhtml]
+allow_xul_xbl = true
 [test_image_cache_notification.html]

js/xpconnect/tests/chrome/chrome.ini

@@ -80,6 +80,7 @@ skip-if = os == 'win' || os == 'mac' || (os == 'linux' && !debug) # bug 1131110,
 [test_bug866823.xhtml]
 [test_bug895340.xhtml]
 [test_bug932906.xhtml]
+allow_xul_xbl = true
 [test_bug996069.xhtml]
 [test_bug1041626.xhtml]
 [test_bug1042436.xhtml]

layout/xul/test/mochitest.ini

@@ -3,7 +3,9 @@ support-files =
   file_bug386386.sjs
 [test_blockify_moz_box.html]
 [test_bug386386.html]
+allow_xul_xbl = true
 [test_bug394800.xhtml]
+allow_xul_xbl = true
 [test_bug511075.html]
 skip-if = toolkit == 'android' #bug 798806
 [test_bug563416.html]

testing/mochitest/browser-harness.xhtml

@@ -111,6 +111,7 @@
       this.path = aTestFile['url'];
       this.expected = aTestFile['expected'];
       this.https_first_disabled = aTestFile['https_first_disabled'] || false,
+      this.allow_xul_xbl = aTestFile['allow_xul_xbl'] || false,
       this.dumper = gDumper;
       this.results = [];
       this.scope = null;

testing/mochitest/browser-test.js

@@ -1087,6 +1087,13 @@ Tester.prototype = {
       });
     }
 
+    if (currentTest.allow_xul_xbl) {
+      window.SpecialPowers.pushPermissions([
+        { type: "allowXULXBL", allow: true, context: "http://mochi.test:8888" },
+        { type: "allowXULXBL", allow: true, context: "http://example.org" },
+      ]);
+    }
+
     // Import utils in the test scope.
     let { scope } = this.currentTest;
     scope.EventUtils = this.EventUtils;

testing/mochitest/manifestLibrary.js

@@ -31,6 +31,7 @@ function parseTestManifest(testManifest, params, callback) {
           url: name,
           expected: obj.expected,
           https_first_disabled: obj.https_first_disabled,
+          allow_xul_xbl: obj.allow_xul_xbl,
         },
       };
     } else {
@@ -43,6 +44,7 @@ function parseTestManifest(testManifest, params, callback) {
           url: name,
           expected: obj.expected,
           https_first_disabled: obj.https_first_disabled,
+          allow_xul_xbl: obj.allow_xul_xbl,
         },
       });
     }

testing/mochitest/runtests.py

@@ -1700,6 +1700,8 @@ toolbar#nav-bar {
                 testob["expected"] = test["expected"]
             if "https_first_disabled" in test:
                 testob["https_first_disabled"] = test["https_first_disabled"] == "true"
+            if "allow_xul_xbl" in test:
+                testob["allow_xul_xbl"] = test["allow_xul_xbl"] == "true"
             if "scheme" in test:
                 testob["scheme"] = test["scheme"]
             if "tags" in test:

testing/mochitest/tests/SimpleTest/TestRunner.js

@@ -564,7 +564,7 @@ TestRunner.getNextUrl = function() {
  * Run the next test. If no test remains, calls onComplete().
  **/
 TestRunner._haltTests = false;
-TestRunner.runNextTest = function() {
+async function _runNextTest() {
   if (
     TestRunner._currentTest < TestRunner._urls.length &&
     !TestRunner._haltTests
@@ -582,6 +582,12 @@ TestRunner.runNextTest = function() {
 
     TestRunner.structuredLogger.testStart(url);
 
+    if (TestRunner._urls[TestRunner._currentTest].test.allow_xul_xbl) {
+      await SpecialPowers.pushPermissions([
+        { type: "allowXULXBL", allow: true, context: "http://mochi.test:8888" },
+        { type: "allowXULXBL", allow: true, context: "http://example.org" },
+      ]);
+    }
     TestRunner._makeIframe(url, 0);
   } else {
     $("current-test").innerHTML = "<b>Finished</b>";
@@ -659,7 +665,8 @@ TestRunner.runNextTest = function() {
       coverageCollector.finalize();
     }
   }
-};
+}
+TestRunner.runNextTest = _runNextTest;
 
 TestRunner.expectChildProcessCrash = function() {
   TestRunner._expectingProcessCrash = true;

toolkit/content/tests/mochitest/mochitest.ini

@@ -3,6 +3,7 @@
 [test_autocomplete_change_after_focus.html]
 skip-if = toolkit == "android"
 [test_mousecapture.xhtml]
+allow_xul_xbl = true
 support-files =
   file_mousecapture.html
   file_mousecapture2.html