Bug 489560. Trying to reenable the test for bug 488417
☠☠ backed out by febbff86f220 ☠ ☠
authorBoris Zbarsky <bzbarsky@mit.edu>
Thu, 23 Apr 2009 13:53:44 -0400
changeset 27682 cad52cbe6537f738b7500bab36eb10a13ec1cbcc
parent 27681 f083055d319ae23e2beeb8c1cffcad62c0e7db5d
child 27683 2157633ea874de148a2ccd59ca210911fb878bce
push id6692
push userbzbarsky@mozilla.com
push dateThu, 23 Apr 2009 17:54:11 +0000
treeherdermozilla-central@cad52cbe6537 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs489560, 488417
milestone1.9.2a1pre
Bug 489560. Trying to reenable the test for bug 488417
layout/generic/test/Makefile.in
layout/generic/test/test_movement_by_characters.html
layout/generic/test/test_movement_by_words.html
--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -70,19 +70,19 @@ include $(topsrcdir)/config/rules.mk
 		test_bug405178.html \
 		test_bug416168.html \
 		test_bug421436.html \
 		test_bug448860.html \
 		test_bug460532.html \
 		test_bug468167.html \
 		test_bug469613.xul \
 		test_bug470212.html \
+		test_bug488417.html \
 		test_movement_by_characters.html \
 		test_movement_by_words.html \
 		test_plugin_clipping.xhtml \
 		test_selection_underline.html \
 		$(NULL)
 # disabled temporarily
 # 		test_plugin_position.xhtml \
-#		test_bug488417.html \
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
--- a/layout/generic/test/test_movement_by_characters.html
+++ b/layout/generic/test/test_movement_by_characters.html
@@ -13,17 +13,17 @@
 <div contentEditable id="editor"></div>
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript;version=1.7">
 
 SimpleTest.waitForExplicitFinish();
 
 // This seems to be necessary because the selection is not set up properly otherwise
-setTimeout(test, 0);
+addLoadEvent(function() { SimpleTest.executeSoon(test); });
 
 function test() {
   var sel = window.getSelection();
   var editor = document.getElementById("editor");
 
   function testRight(node, offset) {
     synthesizeKey("VK_RIGHT", {});
     is(sel.anchorNode, node, "Right movement broken in " + editor.innerHTML);
--- a/layout/generic/test/test_movement_by_words.html
+++ b/layout/generic/test/test_movement_by_words.html
@@ -15,17 +15,17 @@
 <p id="catch">Catch-all
 <pre id="test"><script class="testbody" type="text/javascript;version=1.7">
 
 /** Test for Bug 384147 **/
 
 SimpleTest.waitForExplicitFinish();
 
 // This seems to be necessary because the selection is not set up properly otherwise
-setTimeout(test, 0);
+addLoadEvent(function() { SimpleTest.executeSoon(test); });
 
 var eatSpace;
 
 function getPrefs() {
   const prefSvcContractID = "@mozilla.org/preferences-service;1";
   const prefSvcIID = Components.interfaces.nsIPrefService;
   return Components.classes[prefSvcContractID].getService(prefSvcIID)
                                                .getBranch("layout.word_select.");