Auto merge of #18675 - servo:DETERMINISTIC-ALL-THE-THINGS, r=bzbarsky

Make more media tests not timeout

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18675)
<!-- Reviewable:end -->

19 files changed, 55 insertions, 71 deletions

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 281b70c0e5d..b51adf49ab8 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569297,7 +569297,7 @@
    "manual"
   ],
   "html/semantics/embedded-content/media-elements/audio_loop_base.html": [
-   "7b60d16acf933da11aa65988bf2dfada68c3b853",
+   "0b80893f6737ac647fd0205748ce3e6be437a3c3",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html": [
@@ -569325,31 +569325,31 @@
    "support"
   ],
   "html/semantics/embedded-content/media-elements/error-codes/error.html": [
-   "b13ed034ef354031000614c7f11a20d8fc17653a",
+   "67fa0268d3ceca1508873d5eb0eecfd4853924e0",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplay.html": [
-   "e68b3bfc3a4fb897b1435fc1d7ba4596c2efbfbe",
+   "65d79aca07b4d6387b149896e98fb6996c48efa4",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html": [
-   "49202003dc7204d997b4dcee3a99ae9b9c77399f",
+   "e08596384e2cbca459ba543b6c7cf90b6b3ae5d6",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplaythrough.html": [
-   "7f6e61d2498bb60077c50a2036430a2bf7a7ec9f",
+   "1e8c7c45424c99a2695ff5857166fe34f39ffdc1",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html": [
-   "04dba01a3d3da718a2ea3e65078d41fbfec982be",
+   "9356b4db1afec24866154701da6e9814f5b891a9",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadeddata.html": [
-   "c1457d29ad55ea9e6d723e9d9d144f199f614a79",
+   "8bca4ba5dd134781fa0b5d707352ff181ecfa884",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html": [
-   "7765806a9035b1c94929eb913a68668b6268d900",
+   "6cb2a73e478e7042a443332124d54804279c82f5",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadedmetadata.html": [
@@ -569357,7 +569357,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html": [
-   "247eae45d09620d37ee0714475ab9677b8061b6e",
+   "ac16de99849bb391243ec7d02b2063fc75471dee",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadstart.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini
index bd674d3bc79..8da86942ad5 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/audio_loop_base.html.ini
@@ -1,7 +1,5 @@
 [audio_loop_base.html]
   type: testharness
-  expected: TIMEOUT
-  disabled: extreme timeout
   [Check if audio.loop is set to true that expecting the seeking event is fired more than once]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini
index 0d2482dacf4..28828fd7918 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini
@@ -1,8 +1,7 @@
 [error.html]
   type: testharness
-  expected: TIMEOUT
   [audio.error after successful load]
-    expected: TIMEOUT
+    expected: FAIL
 
   [audio.error after setting src to the empty string]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini
index 1c793999227..68c911f9d10 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini
@@ -1,6 +1,5 @@
 [event_canplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger canplay event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini
index aa6c1d43f14..2284a7f5d4a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini
@@ -1,6 +1,5 @@
 [event_canplay_noautoplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on non-autoplay audio should trigger canplay event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini
index be455cfa535..afa93073b03 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini
@@ -1,6 +1,5 @@
 [event_canplaythrough.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger canplaythrough event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini
index 9eef9aca0a4..ce06cfe5a5d 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini
@@ -1,6 +1,5 @@
 [event_canplaythrough_noautoplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on non-autoplay audio should trigger canplaythrough event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini
index 249d3fa61f6..f38a452d0b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini
@@ -1,12 +1,5 @@
 [event_loadeddata.html]
   type: testharness
-  expected: TIMEOUT
-  [video events - loadeddata]
-    expected: FAIL
-
-  [setting src attribute on autoplay video should trigger loadeddata event]
-    expected: NOTRUN
-
   [setting src attribute on autoplay audio should trigger loadeddata event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini
index 7c16b52bdbe..85c747ceabb 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini
@@ -1,6 +1,5 @@
 [event_loadeddata_noautoplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on non-autoplay audio should trigger loadeddata event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini
index 7d4abbe6b77..bb2d284c99c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini
@@ -1,6 +1,5 @@
 [event_loadedmetadata_noautoplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on non-autoplay audio should trigger loadedmetadata event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_base.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_base.html
index 4917d9c3955..01aa23757ab 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_base.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_base.html
@@ -33,6 +33,7 @@
             looped = true;
         }
 
+        media.addEventListener("error", t.unreached_func());
         media.addEventListener("seeking", startTest, false);
         media.loop = true;
         media.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/error-codes/error.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/error-codes/error.html
index 5123c68f2b9..42d86e49b0e 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/error-codes/error.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/error-codes/error.html
@@ -13,6 +13,7 @@ function error_test(tagName, src) {
   async_test(function(t) {
     var e = document.createElement(tagName);
     e.src = src;
+    e.onerror = t.unreached_func();
     e.onloadeddata = t.step_func(function() {
       assert_equals(e.error, null);
       t.done();
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html
index 8e1b32dcb30..e79c5d1c76d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html
@@ -17,20 +17,22 @@
 test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger canplay event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplay", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplay", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplay");
 
 test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger canplay event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplay", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplay", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplay");
   </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
index 8f3372501d2..811f220d0dd 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
@@ -17,18 +17,16 @@
 test(function () {
   var t = async_test("setting src attribute on non-autoplay audio should trigger canplay event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplay", function() {
-    t.done();
-  }, false);
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplay", t.step_func_done(), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplay");
 
 test(function () {
   var t = async_test("setting src attribute on non-autoplay video should trigger canplay event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplay", function() {
-    t.done();
-  }, false);
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplay", t.step_func_done(), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplay");
   </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html
index 827e796072f..9c5a7625d82 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html
@@ -17,20 +17,22 @@
 test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger canplaythrough event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplaythrough", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplaythrough", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplaythrough");
 
 test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger canplaythrough event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplaythrough", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplaythrough", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplaythrough");
   </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
index 75a70985ab3..8384c01da50 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
@@ -17,18 +17,16 @@
 test(function() {
   var t = async_test("setting src attribute on non-autoplay audio should trigger canplaythrough event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplaythrough", function() {
-    t.done();
-  }, false);
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplaythrough", t.step_func_done(), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplaythrough");
 
 test(function() {
   var t = async_test("setting src attribute on non-autoplay video should trigger canplaythrough event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplaythrough", function() {
-    t.done();
-  }, false);
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplaythrough", t.step_func_done(), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplaythrough");
   </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html
index f0e89c3c160..281719af021 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html
@@ -17,20 +17,22 @@
 test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger loadeddata event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("loadeddata", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadeddata", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - loadeddata");
 
 test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger loadeddata event", {timeout:5000});
-  var a = document.getElementById("v");
-  v.addEventListener("loadeddata", function() {
+  var v = document.getElementById("v");
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadeddata", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - loadeddata");
   </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html
index 0c81f335bb5..cc40a147940 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html
@@ -17,18 +17,16 @@
 test(function() {
   var t = async_test("setting src attribute on non-autoplay audio should trigger loadeddata event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("loadeddata", function() {
-    t.done();
-  }, false);
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadeddata", t.step_func_done(), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - loadeddata");
 
 test(function() {
   var t = async_test("setting src attribute on non-autoplay video should trigger loadeddata event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("loadeddata", function() {
-    t.done();
-  }, false);
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadeddata", t.step_func_done(), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - loadeddata");
   </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html
index 382f3f6fb26..95ec10d3c65 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html
@@ -17,18 +17,16 @@
 test(function() {
   var t = async_test("setting src attribute on non-autoplay audio should trigger loadedmetadata event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("loadedmetadata", function() {
-    t.done();
-  }, false);
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadedmetadata", t.step_func_done(), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - loadedmetadata");
 
 test(function() {
   var t = async_test("setting src attribute on non-autoplay video should trigger loadedmetadata event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("loadedmetadata", function() {
-    t.done();
-  }, false);
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadedmetadata", t.step_func_done(), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events, loadedmetadata");
   </script>