Auto merge of #18675 - servo:DETERMINISTIC-ALL-THE-THINGS, r=bzbarsky

Make more media tests not timeout

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18675)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-29 08:38:51 -05:00 committed by GitHub
commit 8732f6de69
19 changed files with 55 additions and 71 deletions

View file

@ -569297,7 +569297,7 @@
"manual" "manual"
], ],
"html/semantics/embedded-content/media-elements/audio_loop_base.html": [ "html/semantics/embedded-content/media-elements/audio_loop_base.html": [
"7b60d16acf933da11aa65988bf2dfada68c3b853", "0b80893f6737ac647fd0205748ce3e6be437a3c3",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html": [ "html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html": [
@ -569325,31 +569325,31 @@
"support" "support"
], ],
"html/semantics/embedded-content/media-elements/error-codes/error.html": [ "html/semantics/embedded-content/media-elements/error-codes/error.html": [
"b13ed034ef354031000614c7f11a20d8fc17653a", "67fa0268d3ceca1508873d5eb0eecfd4853924e0",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_canplay.html": [ "html/semantics/embedded-content/media-elements/event_canplay.html": [
"e68b3bfc3a4fb897b1435fc1d7ba4596c2efbfbe", "65d79aca07b4d6387b149896e98fb6996c48efa4",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html": [ "html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html": [
"49202003dc7204d997b4dcee3a99ae9b9c77399f", "e08596384e2cbca459ba543b6c7cf90b6b3ae5d6",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_canplaythrough.html": [ "html/semantics/embedded-content/media-elements/event_canplaythrough.html": [
"7f6e61d2498bb60077c50a2036430a2bf7a7ec9f", "1e8c7c45424c99a2695ff5857166fe34f39ffdc1",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html": [ "html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html": [
"04dba01a3d3da718a2ea3e65078d41fbfec982be", "9356b4db1afec24866154701da6e9814f5b891a9",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_loadeddata.html": [ "html/semantics/embedded-content/media-elements/event_loadeddata.html": [
"c1457d29ad55ea9e6d723e9d9d144f199f614a79", "8bca4ba5dd134781fa0b5d707352ff181ecfa884",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html": [ "html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html": [
"7765806a9035b1c94929eb913a68668b6268d900", "6cb2a73e478e7042a443332124d54804279c82f5",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_loadedmetadata.html": [ "html/semantics/embedded-content/media-elements/event_loadedmetadata.html": [
@ -569357,7 +569357,7 @@
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html": [ "html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html": [
"247eae45d09620d37ee0714475ab9677b8061b6e", "ac16de99849bb391243ec7d02b2063fc75471dee",
"testharness" "testharness"
], ],
"html/semantics/embedded-content/media-elements/event_loadstart.html": [ "html/semantics/embedded-content/media-elements/event_loadstart.html": [

View file

@ -1,7 +1,5 @@
[audio_loop_base.html] [audio_loop_base.html]
type: testharness type: testharness
expected: TIMEOUT
disabled: extreme timeout
[Check if audio.loop is set to true that expecting the seeking event is fired more than once] [Check if audio.loop is set to true that expecting the seeking event is fired more than once]
expected: NOTRUN expected: FAIL

View file

@ -1,8 +1,7 @@
[error.html] [error.html]
type: testharness type: testharness
expected: TIMEOUT
[audio.error after successful load] [audio.error after successful load]
expected: TIMEOUT expected: FAIL
[audio.error after setting src to the empty string] [audio.error after setting src to the empty string]
expected: FAIL expected: FAIL

View file

@ -1,6 +1,5 @@
[event_canplay.html] [event_canplay.html]
type: testharness type: testharness
expected: TIMEOUT
[setting src attribute on autoplay audio should trigger canplay event] [setting src attribute on autoplay audio should trigger canplay event]
expected: NOTRUN expected: FAIL

View file

@ -1,6 +1,5 @@
[event_canplay_noautoplay.html] [event_canplay_noautoplay.html]
type: testharness type: testharness
expected: TIMEOUT
[setting src attribute on non-autoplay audio should trigger canplay event] [setting src attribute on non-autoplay audio should trigger canplay event]
expected: NOTRUN expected: FAIL

View file

@ -1,6 +1,5 @@
[event_canplaythrough.html] [event_canplaythrough.html]
type: testharness type: testharness
expected: TIMEOUT
[setting src attribute on autoplay audio should trigger canplaythrough event] [setting src attribute on autoplay audio should trigger canplaythrough event]
expected: NOTRUN expected: FAIL

View file

@ -1,6 +1,5 @@
[event_canplaythrough_noautoplay.html] [event_canplaythrough_noautoplay.html]
type: testharness type: testharness
expected: TIMEOUT
[setting src attribute on non-autoplay audio should trigger canplaythrough event] [setting src attribute on non-autoplay audio should trigger canplaythrough event]
expected: NOTRUN expected: FAIL

View file

@ -1,12 +1,5 @@
[event_loadeddata.html] [event_loadeddata.html]
type: testharness type: testharness
expected: TIMEOUT [setting src attribute on autoplay audio should trigger loadeddata event]
[video events - loadeddata]
expected: FAIL 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

View file

@ -1,6 +1,5 @@
[event_loadeddata_noautoplay.html] [event_loadeddata_noautoplay.html]
type: testharness type: testharness
expected: TIMEOUT
[setting src attribute on non-autoplay audio should trigger loadeddata event] [setting src attribute on non-autoplay audio should trigger loadeddata event]
expected: NOTRUN expected: FAIL

View file

@ -1,6 +1,5 @@
[event_loadedmetadata_noautoplay.html] [event_loadedmetadata_noautoplay.html]
type: testharness type: testharness
expected: TIMEOUT
[setting src attribute on non-autoplay audio should trigger loadedmetadata event] [setting src attribute on non-autoplay audio should trigger loadedmetadata event]
expected: NOTRUN expected: FAIL

View file

@ -33,6 +33,7 @@
looped = true; looped = true;
} }
media.addEventListener("error", t.unreached_func());
media.addEventListener("seeking", startTest, false); media.addEventListener("seeking", startTest, false);
media.loop = true; media.loop = true;
media.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); media.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();

View file

@ -13,6 +13,7 @@ function error_test(tagName, src) {
async_test(function(t) { async_test(function(t) {
var e = document.createElement(tagName); var e = document.createElement(tagName);
e.src = src; e.src = src;
e.onerror = t.unreached_func();
e.onloadeddata = t.step_func(function() { e.onloadeddata = t.step_func(function() {
assert_equals(e.error, null); assert_equals(e.error, null);
t.done(); t.done();

View file

@ -17,20 +17,22 @@
test(function() { test(function() {
var t = async_test("setting src attribute on autoplay audio should trigger canplay event", {timeout:5000}); var t = async_test("setting src attribute on autoplay audio should trigger canplay event", {timeout:5000});
var a = document.getElementById("a"); var a = document.getElementById("a");
a.addEventListener("canplay", function() { a.addEventListener("error", t.unreached_func());
a.addEventListener("canplay", t.step_func(function() {
t.done(); t.done();
a.pause(); a.pause();
}, false); }), false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - canplay"); }, "audio events - canplay");
test(function() { test(function() {
var t = async_test("setting src attribute on autoplay video should trigger canplay event", {timeout:5000}); var t = async_test("setting src attribute on autoplay video should trigger canplay event", {timeout:5000});
var v = document.getElementById("v"); var v = document.getElementById("v");
v.addEventListener("canplay", function() { v.addEventListener("error", t.unreached_func());
v.addEventListener("canplay", t.step_func(function() {
t.done(); t.done();
v.pause(); v.pause();
}, false); }), false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events - canplay"); }, "video events - canplay");
</script> </script>

View file

@ -17,18 +17,16 @@
test(function () { test(function () {
var t = async_test("setting src attribute on non-autoplay audio should trigger canplay event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay audio should trigger canplay event", {timeout:5000});
var a = document.getElementById("a"); var a = document.getElementById("a");
a.addEventListener("canplay", function() { a.addEventListener("error", t.unreached_func());
t.done(); a.addEventListener("canplay", t.step_func_done(), false);
}, false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - canplay"); }, "audio events - canplay");
test(function () { test(function () {
var t = async_test("setting src attribute on non-autoplay video should trigger canplay event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay video should trigger canplay event", {timeout:5000});
var v = document.getElementById("v"); var v = document.getElementById("v");
v.addEventListener("canplay", function() { v.addEventListener("error", t.unreached_func());
t.done(); v.addEventListener("canplay", t.step_func_done(), false);
}, false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events - canplay"); }, "video events - canplay");
</script> </script>

View file

@ -17,20 +17,22 @@
test(function() { test(function() {
var t = async_test("setting src attribute on autoplay audio should trigger canplaythrough event", {timeout:5000}); var t = async_test("setting src attribute on autoplay audio should trigger canplaythrough event", {timeout:5000});
var a = document.getElementById("a"); var a = document.getElementById("a");
a.addEventListener("canplaythrough", function() { a.addEventListener("error", t.unreached_func());
a.addEventListener("canplaythrough", t.step_func(function() {
t.done(); t.done();
a.pause(); a.pause();
}, false); }), false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - canplaythrough"); }, "audio events - canplaythrough");
test(function() { test(function() {
var t = async_test("setting src attribute on autoplay video should trigger canplaythrough event", {timeout:5000}); var t = async_test("setting src attribute on autoplay video should trigger canplaythrough event", {timeout:5000});
var v = document.getElementById("v"); var v = document.getElementById("v");
v.addEventListener("canplaythrough", function() { v.addEventListener("error", t.unreached_func());
v.addEventListener("canplaythrough", t.step_func(function() {
t.done(); t.done();
v.pause(); v.pause();
}, false); }), false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events - canplaythrough"); }, "video events - canplaythrough");
</script> </script>

View file

@ -17,18 +17,16 @@
test(function() { test(function() {
var t = async_test("setting src attribute on non-autoplay audio should trigger canplaythrough event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay audio should trigger canplaythrough event", {timeout:5000});
var a = document.getElementById("a"); var a = document.getElementById("a");
a.addEventListener("canplaythrough", function() { a.addEventListener("error", t.unreached_func());
t.done(); a.addEventListener("canplaythrough", t.step_func_done(), false);
}, false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - canplaythrough"); }, "audio events - canplaythrough");
test(function() { test(function() {
var t = async_test("setting src attribute on non-autoplay video should trigger canplaythrough event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay video should trigger canplaythrough event", {timeout:5000});
var v = document.getElementById("v"); var v = document.getElementById("v");
v.addEventListener("canplaythrough", function() { v.addEventListener("error", t.unreached_func());
t.done(); v.addEventListener("canplaythrough", t.step_func_done(), false);
}, false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events - canplaythrough"); }, "video events - canplaythrough");
</script> </script>

View file

@ -17,20 +17,22 @@
test(function() { test(function() {
var t = async_test("setting src attribute on autoplay audio should trigger loadeddata event", {timeout:5000}); var t = async_test("setting src attribute on autoplay audio should trigger loadeddata event", {timeout:5000});
var a = document.getElementById("a"); var a = document.getElementById("a");
a.addEventListener("loadeddata", function() { a.addEventListener("error", t.unreached_func());
a.addEventListener("loadeddata", t.step_func(function() {
t.done(); t.done();
a.pause(); a.pause();
}, false); }), false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - loadeddata"); }, "audio events - loadeddata");
test(function() { test(function() {
var t = async_test("setting src attribute on autoplay video should trigger loadeddata event", {timeout:5000}); var t = async_test("setting src attribute on autoplay video should trigger loadeddata event", {timeout:5000});
var a = document.getElementById("v"); var v = document.getElementById("v");
v.addEventListener("loadeddata", function() { v.addEventListener("error", t.unreached_func());
v.addEventListener("loadeddata", t.step_func(function() {
t.done(); t.done();
v.pause(); v.pause();
}, false); }), false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events - loadeddata"); }, "video events - loadeddata");
</script> </script>

View file

@ -17,18 +17,16 @@
test(function() { test(function() {
var t = async_test("setting src attribute on non-autoplay audio should trigger loadeddata event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay audio should trigger loadeddata event", {timeout:5000});
var a = document.getElementById("a"); var a = document.getElementById("a");
a.addEventListener("loadeddata", function() { a.addEventListener("error", t.unreached_func());
t.done(); a.addEventListener("loadeddata", t.step_func_done(), false);
}, false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - loadeddata"); }, "audio events - loadeddata");
test(function() { test(function() {
var t = async_test("setting src attribute on non-autoplay video should trigger loadeddata event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay video should trigger loadeddata event", {timeout:5000});
var v = document.getElementById("v"); var v = document.getElementById("v");
v.addEventListener("loadeddata", function() { v.addEventListener("error", t.unreached_func());
t.done(); v.addEventListener("loadeddata", t.step_func_done(), false);
}, false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events - loadeddata"); }, "video events - loadeddata");
</script> </script>

View file

@ -17,18 +17,16 @@
test(function() { test(function() {
var t = async_test("setting src attribute on non-autoplay audio should trigger loadedmetadata event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay audio should trigger loadedmetadata event", {timeout:5000});
var a = document.getElementById("a"); var a = document.getElementById("a");
a.addEventListener("loadedmetadata", function() { a.addEventListener("error", t.unreached_func());
t.done(); a.addEventListener("loadedmetadata", t.step_func_done(), false);
}, false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random(); a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - loadedmetadata"); }, "audio events - loadedmetadata");
test(function() { test(function() {
var t = async_test("setting src attribute on non-autoplay video should trigger loadedmetadata event", {timeout:5000}); var t = async_test("setting src attribute on non-autoplay video should trigger loadedmetadata event", {timeout:5000});
var v = document.getElementById("v"); var v = document.getElementById("v");
v.addEventListener("loadedmetadata", function() { v.addEventListener("error", t.unreached_func());
t.done(); v.addEventListener("loadedmetadata", t.step_func_done(), false);
}, false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random(); v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events, loadedmetadata"); }, "video events, loadedmetadata");
</script> </script>