From d7d18fc2394021bf39c477b9f6a90577147952f7 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 19:08:19 +0200 Subject: [PATCH] Properly fail in readyState_during_loadedmetadata.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../readyState_during_loadedmetadata.html.ini | 3 +-- .../readyState_during_loadedmetadata.html | 18 ++++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 82ca78466e4..1cfbb3ffb84 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569841,7 +569841,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html": [ - "648caf3811d8b1e07f9bfcc5f53b4be5b048f0d4", + "316ea9d578ba8216f3cfffbe8f13fec9eb648ddb", "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_playing.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini index a3aaca7f389..2780c82a9ba 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini @@ -1,6 +1,5 @@ [readyState_during_loadedmetadata.html] type: testharness - expected: TIMEOUT [audio.readyState should be >= HAVE_METADATA during loadedmetadata event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html index 85db8afb7b4..752d79cdcb4 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html @@ -17,26 +17,24 @@ test(function() { var t = async_test("audio.readyState should be >= HAVE_METADATA during loadedmetadata event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("loadedmetadata", function() { - t.step(function() { - assert_greater_than_equal(a.readyState, a.HAVE_METADATA); - }); + a.addEventListener("error", t.unreached_func()); + a.addEventListener("loadedmetadata", t.step_func(function() { + assert_greater_than_equal(a.readyState, a.HAVE_METADATA); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - readyState property during loadedmetadata"); test(function() { var t = async_test("video.readyState should be >= HAVE_METADATA during loadedmetadata event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("loadedmetadata", function() { - t.step(function() { - assert_greater_than_equal(v.readyState, v.HAVE_METADATA); - }); + v.addEventListener("error", t.unreached_func()); + v.addEventListener("loadedmetadata", t.step_func(function() { + assert_greater_than_equal(v.readyState, v.HAVE_METADATA); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - readyState property during loadedmetadata");