From 60b5b77ccb295bc0c53a450675b6fa716247de04 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_playing.html

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

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index f1e9b980cf1..08b2dba5acd 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569373,7 +569373,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_canplay_playing.html": [
-   "f9a6c488442573dfc0d06acd1f6944d8cb2d585e",
+   "31e4dbecfe979d8d9435f2a69938fa8887ff981e",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini
index 23677cdb6c9..134dda1fdf6 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini
@@ -1,6 +1,5 @@
 [event_order_canplay_playing.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger canplay then playing event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html
index a5a67ddb2df..e498f58cec4 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html
@@ -18,16 +18,15 @@ test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger canplay then playing 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("playing", function() {
-    t.step(function() {
-     assert_true(found_canplay);
-    });
+  }));
+  a.addEventListener("playing", 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 playing");
 
@@ -35,16 +34,15 @@ test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger canplay then playing 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("playing", function() {
-    t.step(function() {
-     assert_true(found_canplay);
-    });
+  }));
+  v.addEventListener("playing", 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 playing");
   </script>