Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…ll 1.5.12
  • Loading branch information...
commit 6fcf1a1126f37a5989cd423b35ba45af3cccb7ed 1 parent 8cbd05d
@Nephyrin Nephyrin authored
Showing with 3 additions and 19 deletions.
  1. +1 −14 mozmill_endurance_test/tabs.js
  2. +2 −5 mozmill_endurance_test/test1.js
View
15 mozmill_endurance_test/tabs.js
@@ -185,19 +185,6 @@ tabBrowser.prototype = {
},
/**
- * 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.
*/
closeAllTabs : function tabBrowser_closeAllTabs()
@@ -207,7 +194,7 @@ tabBrowser.prototype = {
}
this._controller.open("about:blank");
- this.waitForActiveTabComplete();
+ this._controller.waitForPageLoad();
},
/**
View
7 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);
- tabBrowser.waitForActiveTabComplete(); // FIXME revert to ^ when 751424 is fixed
+ controller.waitForPageLoad(controller.tabs.activeTab, 60000, 500);
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);
- tabBrowser.waitForActiveTabComplete(); // FIXME revert to ^ when 751424 is fixed
-
+ controller.waitForPageLoad(controller.tabs.activeTab);
enduranceManager.addCheckpoint("TabsClosed");
controller.sleep(30000);
enduranceManager.addCheckpoint("TabsClosedSettled");
Please sign in to comment.
Something went wrong with that request. Please try again.