Backed out changeset 5221d3a8cc55 (bug 1701777) for causing failures on test_conformance__textures__misc__texture-corner-case-videos.html .

dom/canvas/test/webgl-conf/generated-mochitest.ini

@@ -9070,9 +9070,8 @@ subsuite = webgl2-core
 subsuite = webgl2-core
 [generated/test_2_conformance__textures__misc__texture-corner-case-videos.html]
 subsuite = webgl2-core
-skip-if =
-  (os == 'android')
-  (os == 'linux' && os_version == '18.04')
+skip-if = (os == 'android')
+fail-if = (os == 'linux' && os_version == '18.04')
 [generated/test_2_conformance__textures__misc__texture-cube-as-fbo-attachment.html]
 subsuite = webgl2-core
 [generated/test_2_conformance__textures__misc__texture-draw-with-2d-and-cube.html]

dom/canvas/test/webgl-conf/mochitest-errata.ini

@@ -191,8 +191,10 @@ fail-if = (os == 'linux' && os_version == '18.04')
 skip-if = (os == 'android')
 # Timeout
 [generated/test_2_conformance__textures__misc__texture-corner-case-videos.html]
-# Timeout. Bug 1599937
-skip-if = (os == 'android') || (os == 'linux' && os_version == '18.04')
+skip-if = (os == 'android')
+# Timeout
+fail-if = (os == 'linux' && os_version == '18.04')
+# Bug 1599937
 
 [generated/test_conformance__textures__misc__texture-video-transparent.html]
 # Assertion failure: [GFX1]: Unhandled srcImage->GetFormat(): 2

testing/mochitest/tests/SimpleTest/SimpleTest.js

@@ -2289,10 +2289,3 @@ var add_task = (function() {
 if (usesFailurePatterns()) {
   SimpleTest.requestCompleteLog();
 }
-
-addEventListener("message", async event => {
-  if (event.data == "SimpleTest:timeout") {
-    await SimpleTest.timeout();
-    SimpleTest.finish();
-  }
-});

testing/mochitest/tests/SimpleTest/TestRunner.js

@@ -138,58 +138,21 @@ TestRunner._timeoutFactor = 1;
 TestRunner.jscovDirPrefix = "";
 var coverageCollector = {};
 
-function record(succeeded, expectedFail, msg) {
-  let successInfo;
-  let failureInfo;
-  if (expectedFail) {
-    successInfo = {
-      status: "PASS",
-      expected: "FAIL",
-      message: "TEST-UNEXPECTED-PASS",
-    };
-    failureInfo = {
-      status: "FAIL",
-      expected: "FAIL",
-      message: "TEST-KNOWN-FAIL",
-    };
-  } else {
-    successInfo = {
-      status: "PASS",
-      expected: "PASS",
-      message: "TEST-PASS",
-    };
-    failureInfo = {
-      status: "FAIL",
-      expected: "PASS",
-      message: "TEST-UNEXPECTED-FAIL",
-    };
-  }
-
-  let result = succeeded ? successInfo : failureInfo;
-
-  TestRunner.structuredLogger.testStatus(
-    TestRunner.currentTestURL,
-    msg,
-    result.status,
-    result.expected,
-    "",
-    ""
-  );
-}
-
 TestRunner._checkForHangs = function() {
   function reportError(win, msg) {
-    if (testInXOriginFrame() || "SimpleTest" in win) {
-      record(false, TestRunner.timeoutAsPass, msg);
+    if ("SimpleTest" in win) {
+      if (TestRunner.timeoutAsPass) {
+        win.SimpleTest.record(false, msg, "", "", false);
+      } else {
+        win.SimpleTest.ok(false, msg);
+      }
     } else if ("W3CTest" in win) {
       win.W3CTest.logFailure(msg);
     }
   }
 
   async function killTest(win) {
-    if (testInXOriginFrame()) {
-      win.postMessage("SimpleTest:timeout", "*");
-    } else if ("SimpleTest" in win) {
+    if ("SimpleTest" in win) {
       await win.SimpleTest.timeout();
       win.SimpleTest.finish();
     } else if ("W3CTest" in win) {
@@ -200,10 +163,9 @@ TestRunner._checkForHangs = function() {
   if (TestRunner._currentTest < TestRunner._urls.length) {
     var runtime = new Date().valueOf() - TestRunner._currentTestStartTime;
     if (runtime >= TestRunner.timeout * TestRunner._timeoutFactor) {
-      let testIframe = $("testframe");
       var frameWindow =
-        (!testInXOriginFrame() && testIframe.contentWindow.wrappedJSObject) ||
-        testIframe.contentWindow;
+        $("testframe").contentWindow.wrappedJSObject ||
+        $("testframe").contentWindow;
       // TODO : Do this in a way that reports that the test ended with a status "TIMEOUT"
       reportError(frameWindow, "Test timed out.");