From 97adf791cd72bee3f4f1351e893418f67b5d2fc9 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_playing.html

---
 tests/wpt/metadata/MANIFEST.json                       |  2 +-
 .../media-elements/event_playing.html.ini              |  3 +--
 .../embedded-content/media-elements/event_playing.html | 10 ++++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index c30287e5de5..3b9619034bd 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569401,7 +569401,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_playing.html": [
-   "3cef57701c8c8591046bce55713beb0c007e775f",
+   "e204b0a66e6c51e8ad9e088df567423bc2e81c86",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_playing_noautoplay.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing.html.ini
index c0c94b26fb1..636f37793fe 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_playing.html.ini
@@ -1,6 +1,5 @@
 [event_playing.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger playing event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing.html
index 3741a1c9838..e652607ef39 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing.html
@@ -17,20 +17,22 @@
 test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger playing event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("playing", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("playing", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - playing");
 
 test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger playing event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("playing", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("playing", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - playing");
  </script>