Bug 1180827 - Get rid of a couple of setTimeouts/flaky test requests. r=MattN
authorBlake Kaplan <mrbkap@gmail.com>
Thu, 16 Jul 2015 13:34:40 -0700
changeset 253394 eda42fc9d9284c274a02b53cf06e4b21d23db507
parent 253393 95ac3fd4ccc55aee59dc74ffa190c29eb1f3110a
child 253395 6dc447b14cd7aee4f82e39f3898042570d0dedac
push id29065
push userryanvm@gmail.com
push dateFri, 17 Jul 2015 14:26:32 +0000
treeherdermozilla-central@911935404233 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN
bugs1180827
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1180827 - Get rid of a couple of setTimeouts/flaky test requests. r=MattN
toolkit/components/satchel/test/test_form_autocomplete_with_list.html
--- a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
@@ -424,40 +424,46 @@ function runTest() {
       restoreForm();
       doKey("down");
       break;
 
     case 302:
       // Filter with a letter in the middle of the word.
       synthesizeKey("i", {});
       synthesizeKey("n", {});
-      setTimeout(function() {
-        doKey("down");
-        doKey("return");
-        checkForm("final");
-        expectPopup();
-        restoreForm();
-        doKey("down");
-      }, 500);
+      waitForMenuChange(1);
       break;
 
     case 303:
+      // Continuation of test 302.
+      doKey("down");
+      doKey("return");
+      checkForm("final");
+      expectPopup();
+      restoreForm();
+      doKey("down");
+      break;
+
+    case 304:
       // Filter is disabled with mozNoFilter.
       input.setAttribute('mozNoFilter', 'true');
       synthesizeKey("f", {});
-      setTimeout(function() {
-        doKey("down");
-        doKey("return");
-        checkForm("Google");
-        input.removeAttribute('mozNoFilter');
-        testNum = 399;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-      }, 500);
+      waitForMenuChange(3); // no change
+      break;
+
+    case 305:
+      // Continuation of test 304.
+      doKey("down");
+      doKey("return");
+      checkForm("Google");
+      input.removeAttribute('mozNoFilter');
+      testNum = 399;
+      expectPopup();
+      restoreForm();
+      doKey("down");
       break;
 
     case 400:
       // Check that the input event is fired.
       input.addEventListener("input", function(event) {
         input.removeEventListener("input", arguments.callee, false);
         ok(true, "oninput should have been received");
         ok(event.bubbles, "input event should bubble");
@@ -491,13 +497,12 @@ function checkMenuEntries(expectedValues
 
 function startTest() {
     setupFormHistory(runTest);
 }
 
 window.onload = startTest;
 
 SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
 </script>
 </pre>
 </body>
 </html>