Bug 1161021 patch 2 - Fix unbalanced start_test()/finished_test() calls. r=bzbarsky
authorL. David Baron <dbaron@dbaron.org>
Mon, 04 May 2015 23:39:48 +0200
changeset 242319 cf53ca4ae29a58a1f2f3cc8f11c792ae913667cd
parent 242318 262cebc0d8a0212a9ddfb2db335f074f74433534
child 242320 662519331aa26c1724d6876c0b2223646ae79446
push id28689
push usercbook@mozilla.com
push dateTue, 05 May 2015 10:05:09 +0000
treeherderautoland@754579ec0e68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs1161021, 1156451
milestone40.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 1161021 patch 2 - Fix unbalanced start_test()/finished_test() calls. r=bzbarsky This should fix the main failure mode in bug 1156451, which is results from the transition on #four (the last transition that completes) happening after SimpleTest.finish().
layout/style/test/test_transitions_events.html
--- a/layout/style/test/test_transitions_events.html
+++ b/layout/style/test/test_transitions_events.html
@@ -121,16 +121,17 @@ document.documentElement.addEventListene
       if (!got_before) {
         got_before = true;
         is(event.pseudoElement, "::before");
       } else {
         is(event.pseudoElement, "::after");
       }
       is(event.propertyName, "color");
       is(event.isTrusted, true);
+      finished_test();
     } else {
       if (!did_stops &&
           (event.target == $("five") || event.target == $("six"))) {
         todo(false,
              "timeout to stop transitions firing later than it should be");
         return;
       }
       ok(false,
@@ -201,19 +202,22 @@ document.documentElement.addEventListene
     is(cs("one").getPropertyValue(event.propertyName), "rgb(0, 255, 0)",
        "computed style of " + event.propertyName + " for transitionend on one");
     finished_test();
   }, false);
 
 started_test(); // color on #one
 started_test(); // border-top-color on #one
 started_test(); // border-right-color on #one
+started_test(); // border-right-color on #one (listener on root)
 started_test(); // border-bottom-color on #one
 started_test(); // border-left-color on #one
 started_test(); // -moz-column-rule-color on #one
+started_test(); // text-decoration-color on #one
+started_test(); // outline-color on #one
 $("one").style.color = "lime";
 
 
 $("two").addEventListener("transitionend",
   function(event) {
     event.stopPropagation();
 
     ok(!got_two_target, "transitionend on two on target");