From 3185a7917eede2d92fd870c7e7d8e76d7e3f4e8b Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 29 Sep 2017 14:55:53 +0200
Subject: [PATCH] Fix some shortcomings in event_loadeddata.html

Variable 'v' was undefined in second test, and both tests were missing an onerror event handler.
---
 tests/wpt/metadata/MANIFEST.json                     |  2 +-
 .../media-elements/event_loadeddata.html.ini         |  9 +--------
 .../media-elements/event_loadeddata.html             | 12 +++++++-----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 5e11738afec..449560793b7 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569345,7 +569345,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadeddata.html": [
-   "c1457d29ad55ea9e6d723e9d9d144f199f614a79",
+   "8bca4ba5dd134781fa0b5d707352ff181ecfa884",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini
index 249d3fa61f6..f38a452d0b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini
@@ -1,12 +1,5 @@
 [event_loadeddata.html]
   type: testharness
-  expected: TIMEOUT
-  [video events - loadeddata]
+  [setting src attribute on autoplay audio should trigger loadeddata event]
     expected: FAIL
 
-  [setting src attribute on autoplay video should trigger loadeddata event]
-    expected: NOTRUN
-
-  [setting src attribute on autoplay audio should trigger loadeddata event]
-    expected: NOTRUN
-
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html
index f0e89c3c160..281719af021 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html
@@ -17,20 +17,22 @@
 test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger loadeddata event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("loadeddata", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadeddata", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - loadeddata");
 
 test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger loadeddata event", {timeout:5000});
-  var a = document.getElementById("v");
-  v.addEventListener("loadeddata", function() {
+  var v = document.getElementById("v");
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadeddata", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - loadeddata");
   </script>