From b489d0c1596e8fe357e1d43c8ab688c587236e8b Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 29 Sep 2017 09:27:27 +0200
Subject: [PATCH 1/3] Make event_progress.html deterministic (fixes
 servo/servo#18427)

---
 tests/wpt/metadata/MANIFEST.json               |  2 +-
 .../media-elements/event_progress.html.ini     |  3 +--
 .../media-elements/event_progress.html         | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 20dc1aaea05..05a9bbadef4 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569409,7 +569409,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_progress.html": [
-   "8297355a38ca40dbdb9021f6d28001c7515b7ee4",
+   "ded3566e885ca7d1837f102ebbc6a120708799e4",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_progress_noautoplay.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress.html.ini
index c7df2f3bc99..05705d8e0a5 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress.html.ini
@@ -1,6 +1,5 @@
 [event_progress.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger progress event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html
index 269f824f745..14d170f0e3a 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html
@@ -14,25 +14,27 @@
   </video>
   <div id="log"></div>
   <script>
-test(function() {
+(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger progress event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("progress", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("progress", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
-}, "audio events - progress");
+})();
 
-test(function() {
+(function() {
   var t = async_test("setting src attribute on autoplay video should trigger progress event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("progress", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("progress", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
-}, "video events - progress");
+})();
   </script>
  </body>
 </html>

From abcf91e5c6a2fdbae0a59fd06ba31ba06651ad83 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 29 Sep 2017 09:32:26 +0200
Subject: [PATCH 2/3] Make event_order_loadstart_progress.htm deterministic
 (fixes servo/servo#18289)

---
 tests/wpt/metadata/MANIFEST.json              |  2 +-
 .../event_order_loadstart_progress.html.ini   |  3 +-
 .../event_order_loadstart_progress.html       | 34 +++++++++----------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 05a9bbadef4..c99a5b18f75 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569381,7 +569381,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html": [
-   "013746f8434b90d53724e7cd924f8b430cdc52b3",
+   "1a22967566471d711f6b82c8e59ebd6b8681b004",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_pause.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html.ini
index 424c44bfa6b..cc248913c3d 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html.ini
@@ -1,6 +1,5 @@
 [event_order_loadstart_progress.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger loadstart then progress event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html
index 75e3ba772c2..9ffa1da3a38 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html
@@ -14,39 +14,37 @@
   </video>
   <div id="log"></div>
   <script>
-test(function() {
+(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger loadstart then progress event", {timeout:5000});
   var a = document.getElementById("a");
   var found_loadstart = false;
-  a.addEventListener("loadstart", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadstart", t.step_func(function() {
     found_loadstart = true;
-  });
-  a.addEventListener("progress", function() {
-    t.step(function() {
-     assert_true(found_loadstart);
-    });
+  }));
+  a.addEventListener("progress", t.step_func(function() {
+    assert_true(found_loadstart);
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
-}, "audio events - loadstart, then progress");
+})();
 
-test(function() {
+(function() {
   var t = async_test("setting src attribute on autoplay video should trigger loadstart then progress event", {timeout:5000});
   var v = document.getElementById("v");
   var found_loadstart = false;
-  v.addEventListener("loadstart", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadstart", t.step_func(function() {
     found_loadstart = true;
-  });
-  v.addEventListener("progress", function() {
-    t.step(function() {
-     assert_true(found_loadstart);
-    });
+  }));
+  v.addEventListener("progress", t.step_func(function() {
+    assert_true(found_loadstart);
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
-}, "video events - loadstart, then progress");
+})();
   </script>
  </body>
 </html>

From 53e2a4449aa8f2e14dc70ac6d32e9a8eef1bd9be Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 29 Sep 2017 09:36:54 +0200
Subject: [PATCH 3/3] Make networkState_during_progress.html deterministic
 (fixes servo/servo#17954)

---
 tests/wpt/metadata/MANIFEST.json              |  2 +-
 .../networkState_during_progress.html.ini     |  3 +--
 .../networkState_during_progress.html         | 20 ++++++++-----------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index c99a5b18f75..281b70c0e5d 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569769,7 +569769,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/networkState_during_progress.html": [
-   "e934a38666b8d9fe9c02650b32672ca388bfd03b",
+   "55a5483997ec3c51f3cfb575c12e349935d83dbe",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/networkState_initial.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/networkState_during_progress.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/networkState_during_progress.html.ini
index 8a3383ae89c..0e4c506ece7 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/networkState_during_progress.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/networkState_during_progress.html.ini
@@ -1,6 +1,5 @@
 [networkState_during_progress.html]
   type: testharness
-  expected: TIMEOUT
   [audioElement.networkState should be NETWORK_LOADING during progress event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html
index cf23e822cab..e0b4901ef8e 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html
@@ -16,26 +16,22 @@
   <script>
 var ta = async_test("audioElement.networkState should be NETWORK_LOADING during progress event", {timeout:5000});
 var a = document.getElementById("a");
-a.addEventListener("progress", function() {
-  ta.step(function() {
-   assert_equals(a.networkState,
-   a.NETWORK_LOADING);
-  });
+a.addEventListener("error", ta.unreached_func());
+a.addEventListener("progress", ta.step_func(function() {
+  assert_equals(a.networkState, a.NETWORK_LOADING);
   ta.done();
   a.pause();
-}, false);
+}), false);
 a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 
 var tv = async_test("videoElement.networkState should be NETWORK_LOADING during progress event", {timeout:5000});
 var v = document.getElementById("v");
-v.addEventListener("progress", function() {
-  tv.step(function() {
-   assert_equals(v.networkState,
-   v.NETWORK_LOADING);
-  });
+v.addEventListener("error", tv.unreached_func());
+v.addEventListener("progress", tv.step_func(function() {
+  assert_equals(v.networkState, v.NETWORK_LOADING);
   tv.done();
   v.pause();
-}, false);
+}), false);
 v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
   </script>
  </body>