Bug 1102020, fix and reenable browser_bug537474.js, r=gijs
authorNeil Deakin <neil@mozilla.com>
Fri, 09 Oct 2015 08:50:13 -0400
changeset 300416 b2e96500fbd87f0aa0b268727c5d015c77054213
parent 300415 837aaa5d40394ff9f652eb02a7daf175e9a5c281
child 300417 509dfb8dffa103a637e474fab8db61b9ea651072
push id5392
push userraliiev@mozilla.com
push dateMon, 14 Dec 2015 20:08:23 +0000
treeherdermozilla-beta@16ce8562a975 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs
bugs1102020, 537474
milestone44.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 1102020, fix and reenable browser_bug537474.js, r=gijs
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_bug537474.js
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -196,17 +196,16 @@ skip-if = buildapp == 'mulet'
 skip-if = (os == 'linux' && e10s) # bug 1161699
 [browser_bug519216.js]
 [browser_bug520538.js]
 [browser_bug521216.js]
 [browser_bug533232.js]
 [browser_bug537013.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
 [browser_bug537474.js]
-skip-if = e10s # Bug 1102020 - test tries to use browserDOMWindow.openURI to open a link, and gets a null rv where it expects a window
 [browser_bug550565.js]
 [browser_bug553455.js]
 skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works on mulet?
 [browser_bug555224.js]
 [browser_bug555767.js]
 [browser_bug556061.js]
 [browser_bug559991.js]
 [browser_bug561623.js]
--- a/browser/base/content/test/general/browser_bug537474.js
+++ b/browser/base/content/test/general/browser_bug537474.js
@@ -1,8 +1,8 @@
-function test() {
-  var currentWin = content;
-  var newWin =
-    browserDOMWindow.openURI(makeURI("about:"), null,
-                             Ci.nsIBrowserDOMWindow.OPEN_CURRENTWINDOW, null)
-  is(newWin, currentWin, "page loads in the current content window");
-  gBrowser.stop();
-}
+add_task(function *() {
+  let browserLoadedPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  browserDOMWindow.openURI(makeURI("about:"), null,
+                           Ci.nsIBrowserDOMWindow.OPEN_CURRENTWINDOW, null)
+  yield browserLoadedPromise;
+  is(gBrowser.currentURI.spec, "about:", "page loads in the current content window");
+});
+