From 4923045353fa833f1ca293007534be33444866a5 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 29 Sep 2017 14:31:16 +0200
Subject: [PATCH] Properly fail in event_canplay_noautoplay.html

---
 tests/wpt/metadata/MANIFEST.json                       |  2 +-
 .../media-elements/event_canplay_noautoplay.html.ini   |  3 +--
 .../media-elements/event_canplay_noautoplay.html       | 10 ++++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index aa6a2d6a7ff..c20b0644f23 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569333,7 +569333,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html": [
-   "49202003dc7204d997b4dcee3a99ae9b9c77399f",
+   "e08596384e2cbca459ba543b6c7cf90b6b3ae5d6",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplaythrough.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini
index aa6c1d43f14..2284a7f5d4a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html.ini
@@ -1,6 +1,5 @@
 [event_canplay_noautoplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on non-autoplay audio should trigger canplay event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
index 8f3372501d2..811f220d0dd 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
@@ -17,18 +17,16 @@
 test(function () {
   var t = async_test("setting src attribute on non-autoplay audio should trigger canplay event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplay", function() {
-    t.done();
-  }, false);
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplay", t.step_func_done(), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplay");
 
 test(function () {
   var t = async_test("setting src attribute on non-autoplay video should trigger canplay event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplay", function() {
-    t.done();
-  }, false);
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplay", t.step_func_done(), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplay");
   </script>