From 59c56de10327c7e8bd97afca4a4596e43fd808b6 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_loadedmetadata.html

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

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 5a19f66b960..08bb11b7784 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569353,7 +569353,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadedmetadata.html": [
-   "a0fa9cca891fcdf066409b225daff6d09bf53601",
+   "138177c8cebf75e7fa54e6def5f90cfd094af5d6",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini
index 90e0b6b2fad..1111573d7d5 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini
@@ -1,6 +1,5 @@
 [event_loadedmetadata.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger loadedmetadata event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html
index 234121e58b5..c7e9c93e213 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html
@@ -17,20 +17,22 @@
 test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger loadedmetadata event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("loadedmetadata", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadedmetadata", t.step_func(function() {
     t.done();
     a.pause();
-  });
+  }));
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - loadedmetadata");
 
 test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger loadedmetadata event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("loadedmetadata", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadedmetadata", t.step_func(function() {
     t.done();
     v.pause();
-  });
+  }));
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - loadedmetadata");
   </script>