Bug 1211098 - Fixing race from tab closing. r=gijs
authorGabor Krizsanits <gkrizsanits@mozilla.com>
Tue, 31 Jan 2017 14:16:25 +0100
changeset 468830 e807d24e9b10c0b78c63e8a597e329445c1d4bc2
parent 468829 deb00e365c842e596a870f66f437590ec18079a9
child 468831 069ef3c1416b4bb80b1aaaee819f3736cb682ca8
push id43551
push userbmo:kgilbert@mozilla.com
push dateTue, 31 Jan 2017 23:27:06 +0000
reviewersgijs
bugs1211098
milestone54.0a1
Bug 1211098 - Fixing race from tab closing. r=gijs
browser/base/content/test/urlbar/browser.ini
browser/base/content/test/urlbar/browser_bug562649.js
--- a/browser/base/content/test/urlbar/browser.ini
+++ b/browser/base/content/test/urlbar/browser.ini
@@ -24,17 +24,16 @@ support-files =
 [browser_bug1024133-switchtab-override-keynav.js]
 [browser_bug1025195_switchToTabHavingURI_aOpenParams.js]
 [browser_bug1070778.js]
 [browser_bug1225194-remotetab.js]
 [browser_bug304198.js]
 [browser_bug556061.js]
 subsuite = clipboard
 [browser_bug562649.js]
-skip-if = e10s # Bug 1315042
 [browser_bug623155.js]
 support-files =
   redirect_bug623155.sjs
 [browser_bug783614.js]
 [browser_canonizeURL.js]
 [browser_dragdropURL.js]
 [browser_locationBarCommand.js]
 [browser_locationBarExternalLoad.js]
--- a/browser/base/content/test/urlbar/browser_bug562649.js
+++ b/browser/base/content/test/urlbar/browser_bug562649.js
@@ -4,21 +4,21 @@ function test() {
                            null,
                            Ci.nsIBrowserDOMWindow.OPEN_NEWTAB,
                            Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL);
 
   is(gBrowser.userTypedValue, URI, "userTypedValue matches test URI");
   is(gURLBar.value, URI, "location bar value matches test URI");
 
   gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.removeCurrentTab();
+  gBrowser.removeCurrentTab({ skipPermitUnload: true });
   is(gBrowser.userTypedValue, URI, "userTypedValue matches test URI after switching tabs");
   is(gURLBar.value, URI, "location bar value matches test URI after switching tabs");
 
   waitForExplicitFinish();
   BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(() => {
     is(gBrowser.userTypedValue, null, "userTypedValue is null as the page has loaded");
     is(gURLBar.value, URI, "location bar value matches test URI as the page has loaded");
 
-    gBrowser.removeCurrentTab();
+    gBrowser.removeCurrentTab({ skipPermitUnload: true });
     finish();
   });
 }