From 26859aebb11dabbcc0f2939ca5103561669526a2 Mon Sep 17 00:00:00 2001 From: Neil Deakin Date: Wed, 20 Jan 2016 08:42:15 -0500 Subject: [PATCH] Bug 1235372, re-enable search engine behavior tests in e10s, r=florian --- browser/components/search/test/browser.ini | 5 ----- browser/components/search/test/browser_abouthome_behavior.js | 3 +++ browser/components/search/test/browser_amazon_behavior.js | 3 +++ browser/components/search/test/browser_bing_behavior.js | 3 +++ browser/components/search/test/browser_eBay_behavior.js | 3 +++ browser/components/search/test/browser_google_behavior.js | 3 +++ browser/components/search/test/browser_yahoo_behavior.js | 3 +++ 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/browser/components/search/test/browser.ini b/browser/components/search/test/browser.ini index 15874bd7f640..6b9c48d6c22a 100644 --- a/browser/components/search/test/browser.ini +++ b/browser/components/search/test/browser.ini @@ -18,17 +18,13 @@ support-files = [browser_addEngine.js] [browser_amazon.js] [browser_amazon_behavior.js] -skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}] [browser_bing.js] [browser_bing_behavior.js] -skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}] [browser_contextmenu.js] [browser_eBay.js] [browser_eBay_behavior.js] -skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}] [browser_google.js] [browser_google_behavior.js] -skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}] [browser_healthreport.js] [browser_hiddenOneOffs_cleanup.js] [browser_hiddenOneOffs_diacritics.js] @@ -37,7 +33,6 @@ skip-if = e10s # bug ?????? - Test alters the searchbar textbox value which caus [browser_private_search_perwindowpb.js] [browser_yahoo.js] [browser_yahoo_behavior.js] -skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}] [browser_abouthome_behavior.js] skip-if = e10s || true # Bug ??????, Bug 1100301 - leaks windows until shutdown when --run-by-dir [browser_searchbar_openpopup.js] diff --git a/browser/components/search/test/browser_abouthome_behavior.js b/browser/components/search/test/browser_abouthome_behavior.js index dab5091bf13e..2c5909709f13 100644 --- a/browser/components/search/test/browser_abouthome_behavior.js +++ b/browser/components/search/test/browser_abouthome_behavior.js @@ -119,6 +119,9 @@ function test() { if (!(flags & docStart) || !webProgress.isTopLevel) return; + if (req.originalURI.spec == "about:blank") + return; + info("received document start"); ok(req instanceof Ci.nsIChannel, "req is a channel"); diff --git a/browser/components/search/test/browser_amazon_behavior.js b/browser/components/search/test/browser_amazon_behavior.js index decb43e4d501..daa14b04d255 100644 --- a/browser/components/search/test/browser_amazon_behavior.js +++ b/browser/components/search/test/browser_amazon_behavior.js @@ -136,6 +136,9 @@ function test() { if (!(flags & docStart) || !webProgress.isTopLevel) return; + if (req.originalURI.spec == "about:blank") + return; + info("received document start"); ok(req instanceof Ci.nsIChannel, "req is a channel"); diff --git a/browser/components/search/test/browser_bing_behavior.js b/browser/components/search/test/browser_bing_behavior.js index 57cf7ab32064..c7d9b75ec51a 100644 --- a/browser/components/search/test/browser_bing_behavior.js +++ b/browser/components/search/test/browser_bing_behavior.js @@ -136,6 +136,9 @@ function test() { if (!(flags & docStart) || !webProgress.isTopLevel) return; + if (req.originalURI.spec == "about:blank") + return; + info("received document start"); ok(req instanceof Ci.nsIChannel, "req is a channel"); diff --git a/browser/components/search/test/browser_eBay_behavior.js b/browser/components/search/test/browser_eBay_behavior.js index 9879b564d3a6..36e75c147ee2 100644 --- a/browser/components/search/test/browser_eBay_behavior.js +++ b/browser/components/search/test/browser_eBay_behavior.js @@ -136,6 +136,9 @@ function test() { if (!(flags & docStart) || !webProgress.isTopLevel) return; + if (req.originalURI.spec == "about:blank") + return; + info("received document start"); ok(req instanceof Ci.nsIChannel, "req is a channel"); diff --git a/browser/components/search/test/browser_google_behavior.js b/browser/components/search/test/browser_google_behavior.js index 69ef26a46d19..07738ac472d3 100644 --- a/browser/components/search/test/browser_google_behavior.js +++ b/browser/components/search/test/browser_google_behavior.js @@ -134,6 +134,9 @@ function test() { if (!(flags & docStart) || !webProgress.isTopLevel) return; + if (req.originalURI.spec == "about:blank") + return; + info("received document start"); ok(req instanceof Ci.nsIChannel, "req is a channel"); diff --git a/browser/components/search/test/browser_yahoo_behavior.js b/browser/components/search/test/browser_yahoo_behavior.js index 932478e56928..f8206df8f5fe 100644 --- a/browser/components/search/test/browser_yahoo_behavior.js +++ b/browser/components/search/test/browser_yahoo_behavior.js @@ -136,6 +136,9 @@ function test() { if (!(flags & docStart) || !webProgress.isTopLevel) return; + if (req.originalURI.spec == "about:blank") + return; + info("received document start"); ok(req instanceof Ci.nsIChannel, "req is a channel");