From 4ca5a05eedc85dfb9d7eeafb15179d7f44f22cbd Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 29 Sep 2017 18:59:37 +0200
Subject: [PATCH] Properly fail in readyState_during_canplay.html

---
 tests/wpt/metadata/MANIFEST.json               |  2 +-
 .../readyState_during_canplay.html.ini         |  3 +--
 .../readyState_during_canplay.html             | 18 ++++++++----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 11b76665934..a31f44d56fd 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569829,7 +569829,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/readyState_during_canplay.html": [
-   "7e3844240c9f1ffcde0e0cff68ca747e2ee4bd01",
+   "46f26243997dbf45039bca830b3b8faa46cafa73",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini
index 5fedd9f11c4..189ef226dc8 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini
@@ -1,6 +1,5 @@
 [readyState_during_canplay.html]
   type: testharness
-  expected: TIMEOUT
   [audio.readyState should be >= HAVE_FUTURE_DATA during canplay event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html
index 09ad89f8bfd..5ab3f881b40 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html
@@ -17,26 +17,24 @@
 test(function() {
   var t = async_test("audio.readyState should be >= HAVE_FUTURE_DATA during canplay event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplay", function() {
-    t.step(function() {
-     assert_greater_than_equal(a.readyState, a.HAVE_FUTURE_DATA);
-    });
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplay", t.step_func(function() {
+    assert_greater_than_equal(a.readyState, a.HAVE_FUTURE_DATA);
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - readyState property during canplay");
 
 test(function() {
   var t = async_test("video.readyState should be >= HAVE_FUTURE_DATA during canplay event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplay", function() {
-    t.step(function() {
-     assert_greater_than_equal(v.readyState, v.HAVE_FUTURE_DATA);
-    });
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplay", t.step_func(function() {
+    assert_greater_than_equal(v.readyState, v.HAVE_FUTURE_DATA);
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - readyState property during canplay");
   </script>