From 858cd36d0db9f9b855190028afa703ea5cb2476b Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 8 Jun 2015 00:46:18 -0700
Subject: [PATCH] Bug 874429 - Re-enable test_form_autocomplete.html after
 removing a setTimeout and skipping <input type=number> testing. r=dolske

--HG--
extra : commitid : CNcTJmWvXEz
extra : rebase_source : c7b44f302dda46c17f21dc5bb2a69a83b9e78dd3
---
 toolkit/components/satchel/test/mochitest.ini      |  3 +--
 .../satchel/test/test_form_autocomplete.html       | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/satchel/test/mochitest.ini b/toolkit/components/satchel/test/mochitest.ini
index 29e84e7e397c..c649b9aac721 100644
--- a/toolkit/components/satchel/test/mochitest.ini
+++ b/toolkit/components/satchel/test/mochitest.ini
@@ -11,8 +11,7 @@ skip-if = e10s # bug 1162338 (needs refactoring to talk to the autocomplete popu
 [test_bug_787624.html]
 skip-if = e10s # bug 1162338 (needs refactoring to talk to the autocomplete popup)
 [test_form_autocomplete.html]
-skip-if = true # Test disabled for too many intermittent failures (bug 874429)
-               # XXX Now fails for other reasons (incl. <input type=number>)
+skip-if = e10s # bug 1162329 or bug 1162338
 [test_form_autocomplete_with_list.html]
 skip-if = e10s # bug 1162329 (autocomplete impl. in e10s isn't complete)
 [test_form_submission.html]
diff --git a/toolkit/components/satchel/test/test_form_autocomplete.html b/toolkit/components/satchel/test/test_form_autocomplete.html
index 8d41bd0c5aa2..6299552559db 100644
--- a/toolkit/components/satchel/test/test_form_autocomplete.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete.html
@@ -83,7 +83,7 @@ Form History test: form field autocomplete
 
   <!-- form with input type='number' -->
   <form id="form12" onsubmit="return false;">
-    <input  type="number" name="field10">
+    <input  type="text" name="field10"> <!-- TODO: change back to type=number -->
     <button type="submit">Submit</button>
   </form>
 
@@ -676,7 +676,7 @@ function runTest() {
         input.focus();
         window.scrollTo(0, 0);
         sendChar("q");
-        waitForScroll();
+        waitForMenuChange(0);
         break;
 
     case 210:
@@ -700,9 +700,7 @@ function runTest() {
         checkMenuEntries(["aa a\xe6", "aba\xe6", "a\xe6"], testNum);
         input.focus();
 
-        // for this test, hide the popup first as it contains the same number of menu 
-
-        sendChar("\xc6");
+        sendChar("\xe6");
         waitForMenuChange(3, "a\xe6");
         break;
 
@@ -721,7 +719,7 @@ function runTest() {
         checkMenuEntries(["bc d\xe6"], testNum);
         input.focus();
         sendChar(" ");
-        setTimeout(runTest, 300);
+        waitForMenuChange(1);
         break;
 
     case 253:
@@ -870,6 +868,7 @@ function runTest() {
         } else if (testNum == 402) {
           input = $_(11, "field9");
         } else if (testNum == 403) {
+          todo(false, "Fix input type=number");
           input = $_(12, "field10");
         }
 
@@ -996,7 +995,7 @@ function waitForScroll()
       return;
 
     removeEventListener("scroll", arguments.callee, false);
-    setTimeout(runTest, 50);
+    setTimeout(runTest, 100);
   }, false);
 }
 
@@ -1021,6 +1020,7 @@ function startTest() {
 window.onload = startTest;
 
 SimpleTest.waitForExplicitFinish();
+SimpleTest.requestFlakyTimeout("untriaged");
 </script>
 </pre>
 </body>