[Endurance] Revert waitForPageLoad() workarounds, fixed in that mozmi…

…ll 1.5.12
mozilla · May 9, 2012 · 6fcf1a1 · 6fcf1a1
1 parent 8cbd05d
commit 6fcf1a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/mozmill_endurance_test/tabs.js b/mozmill_endurance_test/tabs.js
@@ -184,19 +184,6 @@ tabBrowser.prototype = {
     this._controller.window.TabsOnTop.enabled = aValue;
   },
 
-  /**
-   * Waits for page load, avoiding the controller.waitForPageLoad() call as a
-   * HACK around bug 751424 - remove when fixed
-   */
-  waitForActiveTabComplete : function tabBrowserwaitForActiveTabComplete()
-  {
-    this._controller.sleep(1000);
-    var tab = this._controller.tabs.activeTab;
-    return this._controller.waitFor(function () {
-      return tab.readyState == "complete";
-     }, null, 60000, 100);
-  },
-
   /**
    * Close all tabs of the window except the last one and open a blank page.
    */
@@ -207,7 +194,7 @@ tabBrowser.prototype = {
     }
 
     this._controller.open("about:blank");
-    this.waitForActiveTabComplete();
+    this._controller.waitForPageLoad();
   },
 
   /**

diff --git a/mozmill_endurance_test/test1.js b/mozmill_endurance_test/test1.js
@@ -221,8 +221,7 @@ function testMemoryUsage() {
       var site = TEST_SITES[siteIndex];
 
       controller.open(site);
-      // controller.waitForPageLoad(controller.tabs.activeTab, 60000, 500);
+      controller.waitForPageLoad(controller.tabs.activeTab, 60000, 500);
-      tabBrowser.waitForActiveTabComplete(); // FIXME revert to ^ when 751424 is fixed
       controller.assert(function () { return controller.tabs.activeTab.readyState == "complete"; });
       if (perTabPause) controller.sleep(perTabPause * 1000)
     });
@@ -233,9 +232,7 @@ function testMemoryUsage() {
     waitGC();
     enduranceManager.addCheckpoint("TabsOpenForceGC");
     tabBrowser.closeAllTabs();
-    // controller.waitForPageLoad(controller.tabs.activeTab);
+    controller.waitForPageLoad(controller.tabs.activeTab);
-    tabBrowser.waitForActiveTabComplete(); // FIXME revert to ^ when 751424 is fixed
-
     enduranceManager.addCheckpoint("TabsClosed");
     controller.sleep(30000);
     enduranceManager.addCheckpoint("TabsClosedSettled");