From 7bab9caafddd5e4f2b0e1a39b7e6a6063a492cd4 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 16:51:55 +0200 Subject: [PATCH 01/22] Properly use test() in event_progress.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../embedded-content/media-elements/event_progress.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index b51adf49ab8..12e28f62e74 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569409,7 +569409,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_progress.html": [ - "ded3566e885ca7d1837f102ebbc6a120708799e4", + "c5d307c9d5b3283f72c88f1496e9ccd6526db285", "testharness" ], "html/semantics/embedded-content/media-elements/event_progress_noautoplay.html": [ diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html index 14d170f0e3a..b29c65ccf5c 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html @@ -14,7 +14,7 @@
From 2b64c3e6c008d2a0185978972607c2ec0d407ffa Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 16:51:55 +0200 Subject: [PATCH 02/22] Properly use test() in event_order_loadstart_progress.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../media-elements/event_order_loadstart_progress.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 12e28f62e74..76c5d723fab 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569381,7 +569381,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html": [ - "1a22967566471d711f6b82c8e59ebd6b8681b004", + "4041b86a67a3b2759856bd878af62fb88b07a129", "testharness" ], "html/semantics/embedded-content/media-elements/event_pause.html": [ diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html index 9ffa1da3a38..889336f9d92 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html @@ -14,7 +14,7 @@
From 9f71ac915543c74c05ca78ad4840887fec4372b0 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 16:51:55 +0200 Subject: [PATCH 03/22] Properly use test() in networkState_during_progress.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../networkState_during_progress.html | 40 ++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 76c5d723fab..5a19f66b960 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569769,7 +569769,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/networkState_during_progress.html": [ - "55a5483997ec3c51f3cfb575c12e349935d83dbe", + "d57f05ca1884cc3dbdaac9130cba1f63adf693ed", "testharness" ], "html/semantics/embedded-content/media-elements/networkState_initial.html": [ diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html index e0b4901ef8e..141968a299e 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html @@ -14,25 +14,29 @@
From 59c56de10327c7e8bd97afca4a4596e43fd808b6 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 04/22] 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"); From 026130094d039b49697e3b63b4d97d1ed48c2aeb Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 05/22] Properly fail in event_order_canplay_canplaythrough.html --- tests/wpt/metadata/MANIFEST.json | 2 +- ...vent_order_canplay_canplaythrough.html.ini | 3 +-- .../event_order_canplay_canplaythrough.html | 26 +++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 08bb11b7784..f1e9b980cf1 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569369,7 +569369,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html": [ - "70e74de8fe3eab2c775489364faa1eab832ef14d", + "a9a9889a42a2fb654bc09d543320fc5adaf82157", "testharness" ], "html/semantics/embedded-content/media-elements/event_order_canplay_playing.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini index 14be106cd9c..349cfd0463e 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html.ini @@ -1,6 +1,5 @@ [event_order_canplay_canplaythrough.html] type: testharness - expected: TIMEOUT [setting src attribute on autoplay audio should trigger canplay then canplaythrough event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html index a1e7e4155ac..ceaa9aaa7ed 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html @@ -18,16 +18,15 @@ test(function() { var t = async_test("setting src attribute on autoplay audio should trigger canplay then canplaythrough event", {timeout:5000}); var a = document.getElementById("a"); var found_canplay = false; - a.addEventListener("canplay", function() { + a.addEventListener("error", t.unreached_func()); + a.addEventListener("canplay", t.step_func(function() { found_canplay = true; - }); - a.addEventListener("canplaythrough", function() { - t.step(function() { - assert_true(found_canplay); - }); + })); + a.addEventListener("canplaythrough", t.step_func(function() { + assert_true(found_canplay); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - canplay, then canplaythrough"); @@ -35,16 +34,15 @@ test(function() { var t = async_test("setting src attribute on autoplay video should trigger canplay then canplaythrough event", {timeout:5000}); var v = document.getElementById("v"); var found_canplay = false; - v.addEventListener("canplay", function() { + v.addEventListener("error", t.unreached_func()); + v.addEventListener("canplay", t.step_func(function() { found_canplay = true; - }); - v.addEventListener("canplaythrough", function() { - t.step(function() { - assert_true(found_canplay); - }); + })); + v.addEventListener("canplaythrough", t.step_func(function() { + assert_true(found_canplay); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - canplay, then canplaythrough"); From 60b5b77ccb295bc0c53a450675b6fa716247de04 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 06/22] Properly fail in event_order_canplay_playing.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../event_order_canplay_playing.html.ini | 3 +-- .../event_order_canplay_playing.html | 26 +++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index f1e9b980cf1..08b2dba5acd 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569373,7 +569373,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_order_canplay_playing.html": [ - "f9a6c488442573dfc0d06acd1f6944d8cb2d585e", + "31e4dbecfe979d8d9435f2a69938fa8887ff981e", "testharness" ], "html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini index 23677cdb6c9..134dda1fdf6 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini @@ -1,6 +1,5 @@ [event_order_canplay_playing.html] type: testharness - expected: TIMEOUT [setting src attribute on autoplay audio should trigger canplay then playing event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html index a5a67ddb2df..e498f58cec4 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html @@ -18,16 +18,15 @@ test(function() { var t = async_test("setting src attribute on autoplay audio should trigger canplay then playing event", {timeout:5000}); var a = document.getElementById("a"); var found_canplay = false; - a.addEventListener("canplay", function() { + a.addEventListener("error", t.unreached_func()); + a.addEventListener("canplay", t.step_func(function() { found_canplay = true; - }); - a.addEventListener("playing", function() { - t.step(function() { - assert_true(found_canplay); - }); + })); + a.addEventListener("playing", t.step_func(function() { + assert_true(found_canplay); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - canplay, then playing"); @@ -35,16 +34,15 @@ test(function() { var t = async_test("setting src attribute on autoplay video should trigger canplay then playing event", {timeout:5000}); var v = document.getElementById("v"); var found_canplay = false; - v.addEventListener("canplay", function() { + v.addEventListener("error", t.unreached_func()); + v.addEventListener("canplay", t.step_func(function() { found_canplay = true; - }); - v.addEventListener("playing", function() { - t.step(function() { - assert_true(found_canplay); - }); + })); + v.addEventListener("playing", t.step_func(function() { + assert_true(found_canplay); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - canplay, then playing"); From 7b7f66f210bb149d93f1ac075f212ebd93aa2cc7 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 07/22] Properly fail in event_order_loadedmetadata_loadeddata.html --- tests/wpt/metadata/MANIFEST.json | 4 +-- ...t_order_loadedmetadata_loadeddata.html.ini | 3 +-- ...event_order_loadedmetadata_loadeddata.html | 26 +++++++++---------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 08b2dba5acd..2f85fde17f5 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569373,11 +569373,11 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_order_canplay_playing.html": [ - "31e4dbecfe979d8d9435f2a69938fa8887ff981e", + "7d2254f2362cc90fd7f7573d5c7b7a9bfd29187e", "testharness" ], "html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html": [ - "1f9a9ee27d7cedb3c7f128276770334780afb523", + "47080891dfd6b2f011fdbb6423e2635ac84eecc4", "testharness" ], "html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini index ef23353c3bc..767a2a5bf71 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini @@ -1,6 +1,5 @@ [event_order_loadedmetadata_loadeddata.html] type: testharness - expected: TIMEOUT [setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html index 3aba3684f19..4c0054c241d 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html @@ -18,16 +18,15 @@ test(function() { var t = async_test("setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event", {timeout:5000}); var a = document.getElementById("a"); var found_loadedmetadata = false; - a.addEventListener("loadedmetadata", function() { + a.addEventListener("error", t.unreached_func()); + a.addEventListener("loadedmetadata", t.step_func(function() { found_loadedmetadata = true; - }); - a.addEventListener("loadeddata", function() { - t.step(function() { - assert_true(found_loadedmetadata); - }); + })); + a.addEventListener("loadeddata", t.step_func(function() { + assert_true(found_loadedmetadata); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - loadedmetadata, then loadeddata"); @@ -35,16 +34,15 @@ test(function() { var t = async_test("setting src attribute on autoplay video should trigger loadedmetadata then loadeddata event", {timeout:5000}); var v = document.getElementById("v"); var found_loadedmetadata = false; - v.addEventListener("loadedmetadata", function() { + v.addEventListener("error", t.unreached_func()); + v.addEventListener("loadedmetadata", t.step_func(function() { found_loadedmetadata = true; - }); - v.addEventListener("loadeddata", function() { - t.step(function() { - assert_true(found_loadedmetadata); - }); + })); + v.addEventListener("loadeddata", t.step_func(function() { + assert_true(found_loadedmetadata); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - loadedmetadata, then loadeddata"); From 4b2c4aead44ee3c63d6bff9727330c5d93b914e6 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 08/22] Properly fail in event_pause.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../media-elements/event_pause.html.ini | 3 +-- .../media-elements/event_pause.html | 24 +++++++------------ 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 2f85fde17f5..5a42c953890 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569385,7 +569385,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_pause.html": [ - "d1d4945f75e8febfd1ed29947700da38d9adcda4", + "f7ab9fc551958133aa80482828a59c82ffbfaa7a", "testharness" ], "html/semantics/embedded-content/media-elements/event_pause_noautoplay.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini index 74d890c2053..b0c318fc3e8 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_pause.html.ini @@ -1,6 +1,5 @@ [event_pause.html] type: testharness - expected: TIMEOUT [calling pause() on autoplay audio should trigger pause event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause.html index 1f7904c3b74..7a5d171c84f 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause.html @@ -17,30 +17,22 @@ test(function() { var t = async_test("calling pause() on autoplay audio should trigger pause event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("pause", function() { - t.step(function() { - assert_true(true); - }); - t.done(); - }, false); - a.addEventListener("play", function() { + a.addEventListener("error", t.unreached_func()); + a.addEventListener("pause", t.step_func_done(), false); + a.addEventListener("play", t.step_func(function() { a.pause(); // pause right after play - }); + })); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - pause"); test(function() { var t = async_test("calling pause() on autoplay video should trigger pause event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("pause", function() { - t.step(function() { - assert_true(true); - }); - t.done(); - }, false); - v.addEventListener("play", function() { + v.addEventListener("error", t.unreached_func()); + v.addEventListener("pause", t.step_func_done(), false); + v.addEventListener("play", t.step_func(function() { v.pause(); // pause right after play - }); + })); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - pause"); From edd38245199cbc159bd81e6c7237fcb50b4bd18c Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 09/22] Properly fail in event_play.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../media-elements/event_play.html.ini | 3 +-- .../embedded-content/media-elements/event_play.html | 10 ++++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 5a42c953890..c30287e5de5 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569393,7 +569393,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_play.html": [ - "5ab77070444e804dbecad5260dd71ddaa4dba1cb", + "aa4636d5968a489ad21b5bef88185ccf343afb01", "testharness" ], "html/semantics/embedded-content/media-elements/event_play_noautoplay.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini index 4f9118ca9c7..225a5d169ba 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_play.html.ini @@ -1,6 +1,5 @@ [event_play.html] type: testharness - expected: TIMEOUT [setting src attribute on autoplay audio should trigger play event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play.html index 82b2ca40734..acc7f81a858 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play.html @@ -17,20 +17,22 @@ test(function() { var t = async_test("setting src attribute on autoplay audio should trigger play event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("play", function() { + a.addEventListener("error", t.unreached_func()); + a.addEventListener("play", t.step_func(function() { t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - play"); test(function() { var t = async_test("setting src attribute on autoplay video should trigger play event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("play", function() { + v.addEventListener("error", t.unreached_func()); + v.addEventListener("play", t.step_func(function() { t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - play"); From 97adf791cd72bee3f4f1351e893418f67b5d2fc9 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 10/22] 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"); From c93b3d1639c53a1dd18e518c1d9c15aab2c82839 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 11/22] Properly fail in event_progress_noautoplay.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../media-elements/event_progress_noautoplay.html.ini | 3 +-- .../media-elements/event_progress_noautoplay.html | 10 ++++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 3b9619034bd..2c38a11dc56 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569413,7 +569413,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/event_progress_noautoplay.html": [ - "7274516f1fa0685e1f919ccb38cd4601a24aa7a4", + "89441265b92bf193457b05710eac9292c906ac62", "testharness" ], "html/semantics/embedded-content/media-elements/event_timeupdate.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html.ini index 2ba374185c2..29866c58999 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html.ini @@ -1,6 +1,5 @@ [event_progress_noautoplay.html] type: testharness - expected: TIMEOUT [setting src attribute on non-autoplay audio should trigger progress event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html index c594f3036dc..cb54dac7199 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html @@ -17,18 +17,16 @@ test(function() { var t = async_test("setting src attribute on non-autoplay audio should trigger progress event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("progress", function() { - t.done(); - }, false); + a.addEventListener("error", t.unreached_func()); + a.addEventListener("progress", t.step_func_done(), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - progress"); test(function() { var t = async_test("setting src attribute on non-autoplay video should trigger progress event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("progress", function() { - t.done(); - }, false); + v.addEventListener("error", t.unreached_func()); + v.addEventListener("progress", t.step_func_done(), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - progress"); From fb9d3bf35020296900bfd9ba8fc1de2b685f0a47 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 14:47:57 +0200 Subject: [PATCH 12/22] 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"); From b6e3faa317fb137f90b8447a06fa19301edef73b Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 18:41:00 +0200 Subject: [PATCH 13/22] Properly fail in autoplay-overrides-preload.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../autoplay-overrides-preload.html.ini | 9 ++++----- .../autoplay-overrides-preload.html | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 4fd56349162..8b959ba057f 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569577,7 +569577,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html": [ - "ffd2e043a1c07338b597366876b4ca0d79d75e16", + "7db53254abab5d2c6e83b3dff38e9aee24ea4de7", "testharness" ], "html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini index ee8fef80dcc..566ab27894d 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html.ini @@ -1,15 +1,14 @@ [autoplay-overrides-preload.html] type: testharness - expected: TIMEOUT [autoplay (set first) overrides preload "none"] - expected: TIMEOUT + expected: FAIL [autoplay (set last) overrides preload "none"] - expected: TIMEOUT + expected: FAIL [autoplay (set first) overrides preload "metadata"] - expected: TIMEOUT + expected: FAIL [autoplay (set last) overrides preload "metadata"] - expected: TIMEOUT + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html index 91103c58677..332184d55ca 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html @@ -17,6 +17,7 @@ a.preload = preload; a.autoplay = true; } + a.addEventListener('error', t.unreached_func()); a.addEventListener('playing', t.step_func(function() { assert_equals(a.readyState, a.HAVE_ENOUGH_DATA); assert_false(a.paused); From 6aa9d80a005ae54b676c3036b17c3e2f7b1b8fc1 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 18:45:01 +0200 Subject: [PATCH 14/22] Properly fail in load-events-networkState.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../load-events-networkState.html.ini | 3 +-- .../loading-the-media-resource/load-events-networkState.html | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 8b959ba057f..141ec9cd8a6 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569581,7 +569581,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html": [ - "ad2401f93e135e6c9d618870bb07d92cfd0d8dcc", + "bb79a395a0297b288be526f72a7077628d130448", "testharness" ], "html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini index f2bdca77080..0afc8a5b5fc 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini @@ -1,6 +1,5 @@ [load-events-networkState.html] type: testharness - expected: TIMEOUT [NETWORK_IDLE] - expected: TIMEOUT + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html index 8c12011ef02..c6eac703dd3 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html @@ -37,6 +37,7 @@ async_test(function(t) { // fetch the resource" or "once the entire media resource has been fetched" v.preload = 'none'; v.src = getAudioURI('/media/sound_5'); + v.onerror = t.unreached_func(); v.onsuspend = t.step_func(function() { v.onsuspend = null; assert_equals(v.networkState, v.NETWORK_IDLE); @@ -47,6 +48,7 @@ async_test(function(t) { async_test(function(t) { var v = document.createElement('video'); v.src = 'resources/delayed-broken-video.py'; + v.onerror = t.unreached_func(); v.onloadstart = t.step_func(function() { v.onloadstart = null; assert_equals(v.networkState, v.NETWORK_LOADING); From 71e987951fda9cd895ac3e6637bcb7d2e897b917 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 18:52:00 +0200 Subject: [PATCH 15/22] Properly fail in paused_false_during_play.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../paused_false_during_play.html.ini | 3 +-- .../paused_false_during_play.html | 18 ++++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 141ec9cd8a6..ddea03784b2 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569785,7 +569785,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/paused_false_during_play.html": [ - "ff28f3466bf3f0b6df316b774dd4ac28950dbcb7", + "d3a57220a6932719c521953e6ea83f340649dc2b", "testharness" ], "html/semantics/embedded-content/media-elements/paused_true_during_pause.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini index 615a0c04874..0897ac3cc12 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/paused_false_during_play.html.ini @@ -1,6 +1,5 @@ [paused_false_during_play.html] type: testharness - expected: TIMEOUT [audio.paused should be false during play event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html index 28c563333fa..b5d3071388a 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html @@ -17,26 +17,24 @@ test(function() { var t = async_test("audio.paused should be false during play event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("play", function() { - t.step(function() { - assert_false(a.paused); - }); + a.addEventListener("error", t.unreached_func()); + a.addEventListener("play", t.step_func(function() { + assert_false(a.paused); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - paused property"); test(function() { var t = async_test("video.paused should be false during play event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("play", function() { - t.step(function() { - assert_false(v.paused); - }); + v.addEventListener("error", t.unreached_func()); + v.addEventListener("play", t.step_func(function() { + assert_false(v.paused); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - paused property"); From d0020888a2fc21697b645407ba6e8ef694821338 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 18:57:01 +0200 Subject: [PATCH 16/22] Properly fail in autoplay.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../media-elements/ready-states/autoplay.html.ini | 11 +++++------ .../media-elements/ready-states/autoplay.html | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index ddea03784b2..11b76665934 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569825,7 +569825,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/ready-states/autoplay.html": [ - "6ca8c7a50317c932254cf8254c7638d61f8bb00a", + "001cc2fc7405f443e1f83f1685c810371cc24de7", "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_canplay.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini index ac7c23d6b8d..3b7851d22d4 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/ready-states/autoplay.html.ini @@ -1,18 +1,17 @@ [autoplay.html] type: testharness - expected: TIMEOUT [audio.autoplay] - expected: TIMEOUT + expected: FAIL [audio.autoplay and load()] - expected: TIMEOUT + expected: FAIL [audio.autoplay and play()] - expected: TIMEOUT + expected: FAIL [audio.autoplay and pause()] - expected: TIMEOUT + expected: FAIL [audio.autoplay and internal pause steps] - expected: TIMEOUT + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html index 76aef1dbcc9..b60b58a4217 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html @@ -17,7 +17,7 @@ function autoplay_test(tagName, src) { } }); ['canplay', 'canplaythrough', - 'pause', 'play', 'playing'].forEach(function(type) { + 'pause', 'play', 'playing', 'error'].forEach(function(type) { e.addEventListener(type, callback); }); } From 4ca5a05eedc85dfb9d7eeafb15179d7f44f22cbd Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 18:59:37 +0200 Subject: [PATCH 17/22] Properly fail in readyState_during_canplay.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../readyState_during_canplay.html.ini | 3 +-- .../readyState_during_canplay.html | 18 ++++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 11b76665934..a31f44d56fd 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569829,7 +569829,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_canplay.html": [ - "7e3844240c9f1ffcde0e0cff68ca747e2ee4bd01", + "46f26243997dbf45039bca830b3b8faa46cafa73", "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini index 5fedd9f11c4..189ef226dc8 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplay.html.ini @@ -1,6 +1,5 @@ [readyState_during_canplay.html] type: testharness - expected: TIMEOUT [audio.readyState should be >= HAVE_FUTURE_DATA during canplay event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html index 09ad89f8bfd..5ab3f881b40 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html @@ -17,26 +17,24 @@ test(function() { var t = async_test("audio.readyState should be >= HAVE_FUTURE_DATA during canplay event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("canplay", function() { - t.step(function() { - assert_greater_than_equal(a.readyState, a.HAVE_FUTURE_DATA); - }); + a.addEventListener("error", t.unreached_func()); + a.addEventListener("canplay", t.step_func(function() { + assert_greater_than_equal(a.readyState, a.HAVE_FUTURE_DATA); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - readyState property during canplay"); test(function() { var t = async_test("video.readyState should be >= HAVE_FUTURE_DATA during canplay event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("canplay", function() { - t.step(function() { - assert_greater_than_equal(v.readyState, v.HAVE_FUTURE_DATA); - }); + v.addEventListener("error", t.unreached_func()); + v.addEventListener("canplay", t.step_func(function() { + assert_greater_than_equal(v.readyState, v.HAVE_FUTURE_DATA); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - readyState property during canplay"); From 9856580e2551712a063ae7d606cdc73de90a8c58 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 19:01:30 +0200 Subject: [PATCH 18/22] Properly fail in readyState_during_canplaythrough.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../readyState_during_canplaythrough.html.ini | 3 +-- .../readyState_during_canplaythrough.html | 20 ++++++++----------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index a31f44d56fd..52c5996dee3 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569833,7 +569833,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html": [ - "93d9bd7ab6dc10b762ba51d50612421adae3da36", + "d0e49ab44c3919e861bda39e01cda4fcbc1196fa", "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini index e7e4ccec101..1fee36962cd 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini @@ -1,6 +1,5 @@ [readyState_during_canplaythrough.html] type: testharness - expected: TIMEOUT [audio.readyState should be HAVE_ENOUGH_DATA during canplaythrough event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html index 7ef7b5f74fa..2b1910dfd82 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html @@ -17,28 +17,24 @@ test(function() { var t = async_test("audio.readyState should be HAVE_ENOUGH_DATA during canplaythrough event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("canplaythrough", function() { - t.step(function() { - assert_equals(a.readyState, - a.HAVE_ENOUGH_DATA); - }); + a.addEventListener("error", t.unreached_func()); + a.addEventListener("canplaythrough", t.step_func(function() { + assert_equals(a.readyState, a.HAVE_ENOUGH_DATA); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - readyState property during canplaythrough"); test(function() { var t = async_test("video.readyState should be HAVE_ENOUGH_DATA during canplaythrough event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("canplaythrough", function() { - t.step(function() { - assert_equals(v.readyState, - v.HAVE_ENOUGH_DATA); - }); + v.addEventListener("error", t.unreached_func()); + v.addEventListener("canplaythrough", t.step_func(function() { + assert_equals(v.readyState, v.HAVE_ENOUGH_DATA); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - readyState property during canplaythrough"); From ce8fc063db274b21bb5d1232d952a5f42a53c6c9 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 19:03:57 +0200 Subject: [PATCH 19/22] Properly fail in readyState_during_loadeddata.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../readyState_during_loadeddata.html.ini | 3 +-- .../readyState_during_loadeddata.html | 18 ++++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 52c5996dee3..82ca78466e4 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569837,7 +569837,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html": [ - "05eff7f919c9c471f4116d046eb83de3a11cb890", + "0f2040296385970bc1fbb2ffa8604e9d0857ff35", "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini index f765e6bca1d..e7f11ac599a 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini @@ -1,6 +1,5 @@ [readyState_during_loadeddata.html] type: testharness - expected: TIMEOUT [audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html index 1de85eb86ad..7c5838381bb 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html @@ -17,26 +17,24 @@ test(function() { var t = async_test("audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("loadeddata", function() { - t.step(function() { - assert_greater_than_equal(a.readyState, a.HAVE_CURRENT_DATA); - }); + a.addEventListener("error", t.unreached_func()); + a.addEventListener("loadeddata", t.step_func(function() { + assert_greater_than_equal(a.readyState, a.HAVE_CURRENT_DATA); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - readyState property during loadeddata"); test(function() { var t = async_test("video.readyState should be >= HAVE_CURRENT_DATA during loadeddata event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("loadeddata", function() { - t.step(function() { - assert_greater_than_equal(v.readyState, v.HAVE_CURRENT_DATA); - }); + v.addEventListener("error", t.unreached_func()); + v.addEventListener("loadeddata", t.step_func(function() { + assert_greater_than_equal(v.readyState, v.HAVE_CURRENT_DATA); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - readyState property during loadeddata"); From d7d18fc2394021bf39c477b9f6a90577147952f7 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 19:08:19 +0200 Subject: [PATCH 20/22] 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"); From 622533ef4831616041c04cf744d7eb0514aab24f Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 19:10:08 +0200 Subject: [PATCH 21/22] Properly fail in readyState_during_playing.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../readyState_during_playing.html.ini | 3 +-- .../readyState_during_playing.html | 18 ++++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 1cfbb3ffb84..50d48f18c2e 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -569845,7 +569845,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/readyState_during_playing.html": [ - "081d656eb789fa49e09fe0e5936eb10658321aa4", + "663689445bebed727f7fe181ace408ecb2254dcb", "testharness" ], "html/semantics/embedded-content/media-elements/readyState_initial.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_playing.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_playing.html.ini index ce7cf868e7a..21176eb3c40 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_playing.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_playing.html.ini @@ -1,6 +1,5 @@ [readyState_during_playing.html] type: testharness - expected: TIMEOUT [audio.readyState should be >= HAVE_FUTURE_DATA during playing event] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html index 92a1b7f50a6..5e8809851ec 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html @@ -17,26 +17,24 @@ test(function() { var t = async_test("audio.readyState should be >= HAVE_FUTURE_DATA during playing event", {timeout:5000}); var a = document.getElementById("a"); - a.addEventListener("playing", function() { - t.step(function() { - assert_greater_than_equal(a.readyState, a.HAVE_FUTURE_DATA); - }); + a.addEventListener("error", t.unreached_func()); + a.addEventListener("playing", t.step_func(function() { + assert_greater_than_equal(a.readyState, a.HAVE_FUTURE_DATA); t.done(); a.pause(); - }, false); + }), false); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); }, "audio events - readyState property during playing"); test(function() { var t = async_test("video.readyState should be >= HAVE_FUTURE_DATA during playing event", {timeout:5000}); var v = document.getElementById("v"); - v.addEventListener("playing", function() { - t.step(function() { - assert_greater_than_equal(v.readyState, v.HAVE_FUTURE_DATA); - }); + v.addEventListener("error", t.unreached_func()); + v.addEventListener("playing", t.step_func(function() { + assert_greater_than_equal(v.readyState, v.HAVE_FUTURE_DATA); t.done(); v.pause(); - }, false); + }), false); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); }, "video events - readyState property during playing"); From b47331812ad58556d98ba400a66bc07da4fc93a1 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 29 Sep 2017 19:16:37 +0200 Subject: [PATCH 22/22] Properly fail in video_008.html --- tests/wpt/metadata/MANIFEST.json | 2 +- .../embedded-content/media-elements/video_008.htm.ini | 3 +-- .../semantics/embedded-content/media-elements/video_008.htm | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 50d48f18c2e..202288ed310 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -570093,7 +570093,7 @@ "testharness" ], "html/semantics/embedded-content/media-elements/video_008.htm": [ - "087f17d5f7a75ac1990ef7ecb413fc4eaf312be5", + "e34c87a2821b7f307d858afe8b83154664e0e0b5", "testharness" ], "html/semantics/embedded-content/media-elements/video_controls_present-manual.html": [ diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini index 4fa459700a7..b0fec23003c 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini @@ -1,6 +1,5 @@ [video_008.htm] type: testharness - expected: TIMEOUT [HTML5 Media Elements: 'media' attribute] - expected: NOTRUN + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_008.htm b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_008.htm index dff49d82418..c5cb25ed4c2 100644 --- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_008.htm +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_008.htm @@ -21,12 +21,14 @@ videotest.done(); } + var do_error = videotest.unreached_func(); +
-