Bug 1352336 - Restore intermittently failing OMTA tests: test_animations_playbackrate.html, test_animations_iterationstart.html, test_animations_effect_timing_enddelay.html; r=hiro
authorBrian Birtles <birtles@gmail.com>
Fri, 08 Sep 2017 16:40:05 +0900
changeset 379715 915065b1b334373c68e36f583ca35ee7855e05ae
parent 379714 01b0b8eea73fe9b9db4f2138cdf7d120411fe6d7
child 379716 6bbc9cb736d0256d94ad13c593e14f885539bb10
push id32461
push userkwierso@gmail.com
push dateFri, 08 Sep 2017 20:15:32 +0000
treeherdermozilla-central@dd3736e98e4e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershiro
bugs1352336, 1351038
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1352336 - Restore intermittently failing OMTA tests: test_animations_playbackrate.html, test_animations_iterationstart.html, test_animations_effect_timing_enddelay.html; r=hiro This restores the tests disabled in bug 1351038 in the following two changesets: https://hg.mozilla.org/mozilla-central/rev/355a5b1ce195 https://hg.mozilla.org/mozilla-central/rev/42d522a5f9b5 MozReview-Commit-ID: 3chbW5Mkg5S
layout/style/test/file_animations_effect_timing_enddelay.html
layout/style/test/file_animations_iterationstart.html
layout/style/test/file_animations_playbackrate.html
layout/style/test/mochitest.ini
--- a/layout/style/test/file_animations_effect_timing_enddelay.html
+++ b/layout/style/test/file_animations_effect_timing_enddelay.html
@@ -117,32 +117,29 @@ addAsyncAnimTest(async function() {
   advance_clock(400);
   await waitForPaints();
   omta_is(div, "transform", { tx: 40 }, RunningOn.Compositor,
           "Animation is updated on compositor " +
           "duration 1000, endDelay -500, fill forwards, current time 400");
 
   advance_clock(100);
   await waitForPaints();
-  // Bug 1352336: The following should be RunningOn.MainThread
-  omta_is(div, "transform", { tx: 50 }, RunningOn.Either,
+  omta_is(div, "transform", { tx: 50 }, RunningOn.MainThread,
           "Animation is updated on main thread " +
           "duration 1000, endDelay -500, fill forwards, current time 500");
 
   advance_clock(400);
   await waitForPaints();
-  // Bug 1352336: The following should be RunningOn.MainThread
-  omta_is(div, "transform", { tx: 50 }, RunningOn.Either,
+  omta_is(div, "transform", { tx: 50 }, RunningOn.MainThread,
           "Animation is updated on main thread " +
           "duration 1000, endDelay -500, fill forwards, current time 900");
 
   advance_clock(100);
   await waitForPaints();
-  // Bug 1352336: The following should be RunningOn.MainThread
-  omta_is(div, "transform", { tx: 50 }, RunningOn.Either,
+  omta_is(div, "transform", { tx: 50 }, RunningOn.MainThread,
           "Animation is updated on main thread " +
           "duration 1000, endDelay -500, fill forwards, current time 1000");
 
   done_div();
 });
 
 </script>
 </body>
--- a/layout/style/test/file_animations_iterationstart.html
+++ b/layout/style/test/file_animations_iterationstart.html
@@ -45,17 +45,16 @@ addAsyncAnimTest(async function() {
   omta_is(div, "transform", { tx: 50 }, RunningOn.Compositor, "Start of Animation");
 
   advance_clock(4000);
   await waitForPaints();
   omta_is(div, "transform", { tx: 90 }, RunningOn.Compositor, "40% of Animation");
 
   advance_clock(6000);
   await waitForPaints();
-  // Bug 1352336: The following should be RunningOn.MainThread
-  omta_is(div, "transform", { tx: 50 }, RunningOn.Either, "End of Animation");
+  omta_is(div, "transform", { tx: 50 }, RunningOn.MainThread, "End of Animation");
 
   done_div();
 });
 
 </script>
 </body>
 </html>
--- a/layout/style/test/file_animations_playbackrate.html
+++ b/layout/style/test/file_animations_playbackrate.html
@@ -56,18 +56,17 @@ addAsyncAnimTest(async function() {
   var animation = div.getAnimations()[0];
   advance_clock(300);
   await waitForPaints();
 
   animation.playbackRate = 0;
 
   await waitForPaintsFlushed();
 
-  // Bug 1352336: The following should be RunningOn.MainThread
-  omta_is(div, "transform", { tx: 3 }, RunningOn.Either,
+  omta_is(div, "transform", { tx: 3 }, RunningOn.MainThread,
           "animation with zero playback rate should stay in the " +
           "same position and be running on the main thread");
 
   done_div();
 });
 
 addAsyncAnimTest(async function() {
   var [ div, cs ] = new_div("animation: anim 10s 1s");
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -48,17 +48,16 @@ skip-if = stylo # bug 1339656
 [test_animations.html]
 skip-if = (toolkit == 'android')
 [test_animations_async_tests.html]
 support-files = Ahem.ttf file_animations_async_tests.html
 [test_animations_dynamic_changes.html]
 [test_animations_effect_timing_duration.html]
 support-files = file_animations_effect_timing_duration.html
 [test_animations_effect_timing_enddelay.html]
-skip-if = true # bug 1352336
 support-files = file_animations_effect_timing_enddelay.html
 [test_animations_effect_timing_iterations.html]
 support-files = file_animations_effect_timing_iterations.html
 [test_animations_event_order.html]
 [test_animations_event_handler_attribute.html]
 [test_animations_iterationstart.html]
 support-files = file_animations_iterationstart.html
 [test_animations_omta.html]