Bug 453969 - Fix the race in test_bug382113.html so we don't set our child-onload-fired boolean to false _after_ the child onload has already fired. r=froydnj, a=test-only
authorBoris Zbarsky <bzbarsky@mit.edu>
Mon, 09 Mar 2015 21:36:47 -0400
changeset 250331 8fbda87f6b4d
parent 250330 066ad2436c70
child 250332 dc95247d23d7
push id4551
push userryanvm@gmail.com
push date2015-03-10 15:53 +0000
treeherdermozilla-beta@90a33a9f129e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, test-only
bugs453969, 382113
milestone37.0
Bug 453969 - Fix the race in test_bug382113.html so we don't set our child-onload-fired boolean to false _after_ the child onload has already fired. r=froydnj, a=test-only
dom/base/test/mochitest.ini
dom/base/test/test_bug382113.html
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -410,17 +410,16 @@ support-files = test_bug357450.js
 [test_bug372964-2.html]
 [test_bug372964.html]
 [test_bug373181.xhtml]
 [test_bug375314.html]
 [test_bug378969.html]
 [test_bug380418.html]
 support-files = test_bug380418.html^headers^
 [test_bug382113.html]
-skip-if = (os == 'mac' || os == 'win') && debug # bug 453969
 [test_bug382871.html]
 [test_bug384003.xhtml]
 [test_bug390219.html]
 [test_bug390735.html]
 [test_bug392318.html]
 [test_bug392511.html]
 [test_bug393968.html]
 [test_bug395915.html]
--- a/dom/base/test/test_bug382113.html
+++ b/dom/base/test/test_bug382113.html
@@ -2,37 +2,34 @@
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=382113
 -->
 <head>
   <title>Test for Bug 382113</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script class="testbody" type="application/javascript">
+
+    SimpleTest.waitForExplicitFinish();
+    var childGotOnload = false;
+    var objectGotOnload = false;
+
+    /** Test for Bug 100533 **/
+    function checkEvents() {
+      is(childGotOnload, true, "Child got load event");
+      is(objectGotOnload, true, "Object got load event");
+      SimpleTest.finish();
+    }
+  </script>
 </head>
 <body onload="checkEvents()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=382113">Mozilla Bug 382113</a>
 <p id="display"></p>
 <div id="content">
   <object type="text/html" data="bug382113_object.html"
           onload="objectGotOnload = true;"></object>
 </div>
 <pre id="test">
-
-
-<script class="testbody" type="application/javascript">
-
-SimpleTest.waitForExplicitFinish();
-var childGotOnload = false;
-var objectGotOnload = false;
-
-/** Test for Bug 100533 **/
-function checkEvents() {
-  is(childGotOnload, true, "Child got load event");
-  is(objectGotOnload, true, "Object got load event");
-  SimpleTest.finish();
-}
-</script>
-
 </pre>
 </body>
 </html>