From c0040b27fde762c957edf852e77aea8c92649ae9 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_canplaythrough_noautoplay.html

---
 tests/wpt/metadata/MANIFEST.json                       |  2 +-
 .../event_canplaythrough_noautoplay.html.ini           |  3 +--
 .../event_canplaythrough_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 e360a6b10a4..5e11738afec 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569341,7 +569341,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html": [
-   "04dba01a3d3da718a2ea3e65078d41fbfec982be",
+   "9356b4db1afec24866154701da6e9814f5b891a9",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadeddata.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini
index 9eef9aca0a4..ce06cfe5a5d 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html.ini
@@ -1,6 +1,5 @@
 [event_canplaythrough_noautoplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on non-autoplay audio should trigger canplaythrough event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
index 75a70985ab3..8384c01da50 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
@@ -17,18 +17,16 @@
 test(function() {
   var t = async_test("setting src attribute on non-autoplay audio should trigger canplaythrough event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplaythrough", function() {
-    t.done();
-  }, false);
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplaythrough", t.step_func_done(), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplaythrough");
 
 test(function() {
   var t = async_test("setting src attribute on non-autoplay video should trigger canplaythrough event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplaythrough", function() {
-    t.done();
-  }, false);
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplaythrough", t.step_func_done(), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplaythrough");
   </script>