Bug 1259339: allow converted findbar tests to run twice as long. r=felipe
authorMike de Boer <mdeboer@mozilla.com>
Wed, 30 Mar 2016 18:37:11 +0200
changeset 290838 8deca76b439c3f66b37feeefb9c1826f1fb14a84
parent 290837 b994a14879e1a8e03c6e63ba86edcbdcd832535e
child 290839 34fabc54b7a4ad90dade559d0678a1a1ddc21536
push id30127
push userryanvm@gmail.com
push dateThu, 31 Mar 2016 19:47:18 +0000
treeherdermozilla-central@09f42355aa06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs1259339
milestone48.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 1259339: allow converted findbar tests to run twice as long. r=felipe
toolkit/content/tests/chrome/bug331215_window.xul
toolkit/content/tests/chrome/findbar_window.xul
--- a/toolkit/content/tests/chrome/bug331215_window.xul
+++ b/toolkit/content/tests/chrome/bug331215_window.xul
@@ -24,16 +24,17 @@
 
     var gFindBar = null;
     var gBrowser;
 
     var imports = ["SimpleTest", "ok", "info"];
     for (var name of imports) {
       window[name] = window.opener.wrappedJSObject[name];
     }
+    SimpleTest.requestLongerTimeout(2);
 
     function startTest() {
       Task.spawn(function* () {
         gFindBar = document.getElementById("FindToolbar");
         for (let browserId of ["content", "content-remote"]) {
           yield startTestWithBrowser(browserId);
         }
       }).then(() => {
--- a/toolkit/content/tests/chrome/findbar_window.xul
+++ b/toolkit/content/tests/chrome/findbar_window.xul
@@ -56,16 +56,17 @@
 
       onBeforeLinkTraversal: function() { }
     };
 
     var imports = ["SimpleTest", "ok", "is", "info"];
     for (var name of imports) {
       window[name] = window.opener.wrappedJSObject[name];
     }
+    SimpleTest.requestLongerTimeout(2);
 
     function onLoad() {
       Task.spawn(function* () {
         window.QueryInterface(Ci.nsIInterfaceRequestor)
               .getInterface(Ci.nsIWebNavigation)
               .QueryInterface(Ci.nsIDocShellTreeItem)
               .treeOwner
               .QueryInterface(Ci.nsIInterfaceRequestor)
@@ -306,17 +307,17 @@
         promise = promiseFindResult();
         matchCaseCheckbox.click();
         yield promise;
       }
     }
 
     function openFindbar() {
       document.getElementById("cmd_find").doCommand();
-      return gFindBar._startFindDeferred.promise;
+      return gFindBar._startFindDeferred && gFindBar._startFindDeferred.promise;
     }
 
     function* testNormalFindWithComposition() {
       ok(!gFindBar.hidden, "testNormalFindWithComposition: findbar should be open");
       ok(document.commandDispatcher.focusedElement == gFindBar._findField.inputField,
          "testNormalFindWithComposition: find field should be focused");
 
       var matchCaseCheckbox = gFindBar.getElement("find-case-sensitive");