Skip to content

Commit

Permalink
Auto merge of #21895 - Manishearth:gst-mac, r=<try>
Browse files Browse the repository at this point in the history
Revert "Disable event_timeupdate_noautoplay test on mac"

Hopefully the builders now have the right gstreamer things.

From #21543 , needs servo/saltfs#898

<!-- 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/21895)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Oct 9, 2018
2 parents 3b153af + 881c1f4 commit 84ee5b6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/wpt/metadata/MANIFEST.json
Expand Up @@ -610646,7 +610646,7 @@
"testharness"
],
"html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html": [
"eadd84e20381f106144e2f9aa6fda9cd5b553881",
"bd096b7bea953bccbfe5538977ce42af4513500a",
"testharness"
],
"html/semantics/embedded-content/media-elements/event_volumechange.html": [
Expand Down
@@ -1,7 +1,5 @@
[event_timeupdate_noautoplay.html]
type: testharness
disabled:
if os == "mac": https://github.com/servo/saltfs/pull/898
expected: TIMEOUT
[calling play() on a sufficiently long audio should trigger timeupdate event]
expected: NOTRUN
Expand Down
Expand Up @@ -17,7 +17,10 @@
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("error", t.unreached_func());
a.addEventListener("error", t.step_func(function(e) {
console.log("===> ERROR", e.target.error.message, e.target.error.code);
t.unreached_func();
}));
a.addEventListener("timeupdate", t.step_func(function() {
t.done();
a.pause();
Expand All @@ -29,7 +32,10 @@
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("error", t.unreached_func());
v.addEventListener("error", t.step_func(function(e) {
console.log("===> ERROR", e.target.error.message, e.target.error.code);
t.unreached_func();
}));
v.addEventListener("timeupdate", t.step_func(function() {
t.done();
v.pause();
Expand Down

0 comments on commit 84ee5b6

Please sign in to comment.