From 026130094d039b49697e3b63b4d97d1ed48c2aeb Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 29 Sep 2017 14:47:57 +0200
Subject: [PATCH] Properly fail in event_order_canplay_canplaythrough.html

---
 tests/wpt/metadata/MANIFEST.json              |  2 +-
 ...vent_order_canplay_canplaythrough.html.ini |  3 +--
 .../event_order_canplay_canplaythrough.html   | 26 +++++++++----------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 08bb11b7784..f1e9b980cf1 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569369,7 +569369,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html": [
-   "70e74de8fe3eab2c775489364faa1eab832ef14d",
+   "a9a9889a42a2fb654bc09d543320fc5adaf82157",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_canplay_playing.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini
index 14be106cd9c..349cfd0463e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini
@@ -1,6 +1,5 @@
 [event_order_canplay_canplaythrough.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger canplay then canplaythrough event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html
index a1e7e4155ac..ceaa9aaa7ed 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html
@@ -18,16 +18,15 @@ test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger canplay then canplaythrough event", {timeout:5000});
   var a = document.getElementById("a");
   var found_canplay = false;
-  a.addEventListener("canplay", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplay", t.step_func(function() {
     found_canplay = true;
-  });
-  a.addEventListener("canplaythrough", function() {
-    t.step(function() {
-     assert_true(found_canplay);
-    });
+  }));
+  a.addEventListener("canplaythrough", t.step_func(function() {
+    assert_true(found_canplay);
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplay, then canplaythrough");
 
@@ -35,16 +34,15 @@ test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger canplay then canplaythrough event", {timeout:5000});
   var v = document.getElementById("v");
   var found_canplay = false;
-  v.addEventListener("canplay", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplay", t.step_func(function() {
     found_canplay = true;
-  });
-  v.addEventListener("canplaythrough", function() {
-    t.step(function() {
-     assert_true(found_canplay);
-    });
+  }));
+  v.addEventListener("canplaythrough", t.step_func(function() {
+    assert_true(found_canplay);
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplay, then canplaythrough");
  </script>