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