Auto merge of #18672 - servo:DETERMINISTIC-ALL-THE-THINGS, r=SimonSapin

Fix 3 intermittent tests

<!-- 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/18672)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-29 02:46:31 -05:00 committed by GitHub
commit 16b6686bbb
7 changed files with 40 additions and 47 deletions

View file

@ -569381,7 +569381,7 @@
"testharness"
],
"html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html": [
"013746f8434b90d53724e7cd924f8b430cdc52b3",
"1a22967566471d711f6b82c8e59ebd6b8681b004",
"testharness"
],
"html/semantics/embedded-content/media-elements/event_pause.html": [
@ -569409,7 +569409,7 @@
"testharness"
],
"html/semantics/embedded-content/media-elements/event_progress.html": [
"8297355a38ca40dbdb9021f6d28001c7515b7ee4",
"ded3566e885ca7d1837f102ebbc6a120708799e4",
"testharness"
],
"html/semantics/embedded-content/media-elements/event_progress_noautoplay.html": [
@ -569769,7 +569769,7 @@
"testharness"
],
"html/semantics/embedded-content/media-elements/networkState_during_progress.html": [
"e934a38666b8d9fe9c02650b32672ca388bfd03b",
"55a5483997ec3c51f3cfb575c12e349935d83dbe",
"testharness"
],
"html/semantics/embedded-content/media-elements/networkState_initial.html": [

View file

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

View file

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

View file

@ -1,6 +1,5 @@
[networkState_during_progress.html]
type: testharness
expected: TIMEOUT
[audioElement.networkState should be NETWORK_LOADING during progress event]
expected: NOTRUN
expected: FAIL

View file

@ -14,39 +14,37 @@
</video>
<div id="log"></div>
<script>
test(function() {
(function() {
var t = async_test("setting src attribute on autoplay audio should trigger loadstart then progress event", {timeout:5000});
var a = document.getElementById("a");
var found_loadstart = false;
a.addEventListener("loadstart", function() {
a.addEventListener("error", t.unreached_func());
a.addEventListener("loadstart", t.step_func(function() {
found_loadstart = true;
});
a.addEventListener("progress", function() {
t.step(function() {
}));
a.addEventListener("progress", t.step_func(function() {
assert_true(found_loadstart);
});
t.done();
a.pause();
}, false);
}), false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
}, "audio events - loadstart, then progress");
})();
test(function() {
(function() {
var t = async_test("setting src attribute on autoplay video should trigger loadstart then progress event", {timeout:5000});
var v = document.getElementById("v");
var found_loadstart = false;
v.addEventListener("loadstart", function() {
v.addEventListener("error", t.unreached_func());
v.addEventListener("loadstart", t.step_func(function() {
found_loadstart = true;
});
v.addEventListener("progress", function() {
t.step(function() {
}));
v.addEventListener("progress", t.step_func(function() {
assert_true(found_loadstart);
});
t.done();
v.pause();
}, false);
}), false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
}, "video events - loadstart, then progress");
})();
</script>
</body>
</html>

View file

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

View file

@ -16,26 +16,22 @@
<script>
var ta = async_test("audioElement.networkState should be NETWORK_LOADING during progress event", {timeout:5000});
var a = document.getElementById("a");
a.addEventListener("progress", function() {
ta.step(function() {
assert_equals(a.networkState,
a.NETWORK_LOADING);
});
a.addEventListener("error", ta.unreached_func());
a.addEventListener("progress", ta.step_func(function() {
assert_equals(a.networkState, a.NETWORK_LOADING);
ta.done();
a.pause();
}, false);
}), false);
a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
var tv = async_test("videoElement.networkState should be NETWORK_LOADING during progress event", {timeout:5000});
var v = document.getElementById("v");
v.addEventListener("progress", function() {
tv.step(function() {
assert_equals(v.networkState,
v.NETWORK_LOADING);
});
v.addEventListener("error", tv.unreached_func());
v.addEventListener("progress", tv.step_func(function() {
assert_equals(v.networkState, v.NETWORK_LOADING);
tv.done();
v.pause();
}, false);
}), false);
v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
</script>
</body>