From fb9d3bf35020296900bfd9ba8fc1de2b685f0a47 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 on error event in
 event_timeupdate_noautoplay.html

The tests still time out when the browser doesn't fire a timeupdate event
at all.
---
 tests/wpt/metadata/MANIFEST.json                       |  2 +-
 .../event_timeupdate_noautoplay.html.ini               |  2 +-
 .../media-elements/event_timeupdate_noautoplay.html    | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 2c38a11dc56..4fd56349162 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569421,7 +569421,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html": [
-   "5156765c6bc0e4ce9f6d8ca55e48f5871046f7f4",
+   "c2120a0fdf26f370bd88d18794d4c3dc689730a2",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_volumechange.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini
index 22d1f1d6900..e310be391d9 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini
@@ -2,7 +2,7 @@
   type: testharness
   expected: TIMEOUT
   [calling play() on a sufficiently long audio should trigger timeupdate event]
-    expected: NOTRUN
+    expected: FAIL
 
   [calling play() on a sufficiently long video should trigger timeupdate event]
     expected: NOTRUN
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html
index feb4b856883..eadd84e2038 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html
@@ -17,10 +17,11 @@
 test(function() {
   var t = async_test("calling play() on a sufficiently long audio should trigger timeupdate event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("timeupdate", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("timeupdate", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
   a.play();
 }, "audio events - timeupdate");
@@ -28,10 +29,11 @@ test(function() {
 test(function() {
   var t = async_test("calling play() on a sufficiently long video should trigger timeupdate event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("timeupdate", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("timeupdate", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
   v.play();
 }, "video events - timeupdate");