Bug 649012 - Fix some flaky mochitests which rely on non-zero timeout values; rs=ted

2011-04-15 18:26:50 -04:00 · 2011-04-15 18:26:50 -04:00 · 90ceab8629
--- a/content/xul/content/test/test_bug233643.xul
+++ b/content/xul/content/test/test_bug233643.xul
@ -67,7 +67,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=233643
        }

        function do_test() {
-          setTimeout(test_233643, 1000);
+          setTimeout(test_233643, 0);
        }
        addLoadEvent(do_test);
      ]]>
--- a/intl/uconv/tests/test_utf8_overconsumption.html
+++ b/intl/uconv/tests/test_utf8_overconsumption.html
@ -27,7 +27,9 @@ function test()
    SimpleTest.finish();
 }

-  setTimeout(test, 100);
+  addLoadEvent(function() {
+    setTimeout(test, 0);
+  });
  SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
@ -17,7 +17,7 @@
      var newElement = document.createElement("script");
      newElement.src= "http://example.org/tests/security/ssl/mixedcontent/bug329869.js";
      document.body.appendChild(newElement);
-    }, 500);
+    }, 0);
  }

  function afterNavigationTest()
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
@ -14,7 +14,9 @@
  var onLoadFunction = window.onload;
  window.onload = function()
  {
-    window.setTimeout(onLoadFunction, 500);
+    var img1 = document.getElementById("img1");
+    img1.addEventListener("load", onLoadFunction, false);
+    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
  }

  function runTest()
@ -34,9 +36,5 @@

 <body>
  <img id="img1" src="https://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
-  <script type="text/javascript">
-    var img1 = document.getElementById("img1");
-    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
-  </script>
 </body>
 </html>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html
@ -365,10 +365,10 @@ try {
        return d;
    }
    withLock("callLater", function () {
-        return callLater(0.05, checkCallLater, t);
+        return callLater(0, checkCallLater, t);
    });
    withLock("wait", function () {
-        return wait(0.05, t).addCallback(checkCallLater);
+        return wait(0, t).addCallback(checkCallLater);
    });
    withLock("loadJSONDoc", function () {
        var d = loadJSONDoc("test_MochiKit-Async.json");