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