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] 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>