diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in index f0d6966ea77..cf92f44cb59 100644 --- a/content/base/test/Makefile.in +++ b/content/base/test/Makefile.in @@ -179,7 +179,7 @@ _TEST_FILES = test_bug5141.html \ file_bug428847-1.xhtml \ file_bug428847-2.xhtml \ test_bug425201.html \ -# test_bug431833.html \ + test_bug431833.html \ test_bug438519.html \ test_bug444722.html \ test_text_replaceWholeText.html \ diff --git a/content/base/test/test_bug431833.html b/content/base/test/test_bug431833.html index bba4f52337e..844a63c4f94 100644 --- a/content/base/test/test_bug431833.html +++ b/content/base/test/test_bug431833.html @@ -8,8 +8,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=431833 +
+ Mozilla Bug 431833@@ -24,21 +32,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=431833 /** Test for Bug 431833 **/ -var str = "FAIL"; -function test(e) { - if (str == "FAIL") - str = ""; - - str += "PASS: " + e.target.id + '. '; -} - -window.addEventListener('DOMFrameContentLoaded',test,true); - SimpleTest.waitForExplicitFinish(); addLoadEvent(function() { - is(str, "PASS: f1. PASS: f2. PASS: f3. PASS: f4. ", - "DOMFrameContentLoaded events didn't fire?"); + function check(id) { + ok(loadsComplete[id], "DOMFrameContentLoaded didn't fire for " + id); + } + check("f1"); + check("f2"); + check("f3"); + check("f4"); }); addLoadEvent(SimpleTest.finish);