Bug 1112599 - Reenable webconsole tests on e10s that are throwing exception in child process. r=past

browser/devtools/webconsole/test/browser.ini

@@ -148,7 +148,6 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests (intermittent Linux debug)
 [browser_bug_871156_ctrlw_close_tab.js]
 skip-if = e10s # Bug 1042253 - webconsole e10s tests (intermittent Linux debug)
 [browser_cached_messages.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1042253 - webconsole e10s tests (expectUncaughtException)
 [browser_console.js]
 [browser_console_addonsdk_loader_exception.js]
 [browser_console_clear_on_reload.js]
@@ -209,10 +208,8 @@ skip-if = buildapp == 'mulet'
 [browser_webconsole_bug_579412_input_focus.js]
 [browser_webconsole_bug_580001_closing_after_completion.js]
 [browser_webconsole_bug_580030_errors_after_page_reload.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_bug_580454_timestamp_l10n.js]
 [browser_webconsole_bug_582201_duplicate_errors.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js]
 [browser_webconsole_bug_585237_line_limit.js]
 [browser_webconsole_bug_585956_console_trace.js]
@@ -235,19 +232,16 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_bug_595350_multiple_windows_and_tabs.js]
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_bug_595934_message_categories.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
+skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js]
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_bug_597136_external_script_errors.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_bug_597136_network_requests_from_chrome.js]
 [browser_webconsole_bug_597460_filter_scroll.js]
 [browser_webconsole_bug_597756_reopen_closed_tab.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_bug_599725_response_headers.js]
 [browser_webconsole_bug_600183_charset.js]
 [browser_webconsole_bug_601177_log_levels.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_bug_601352_scroll.js]
 [browser_webconsole_bug_601667_filter_buttons.js]
 [browser_webconsole_bug_602572_log_bodies_checkbox.js]
@@ -260,7 +254,6 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_bug_613642_prune_scroll.js]
 [browser_webconsole_bug_614793_jsterm_scroll.js]
 [browser_webconsole_bug_618078_network_exceptions.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_bug_618311_close_panels.js]
 [browser_webconsole_bug_621644_jsterm_dollar.js]
 [browser_webconsole_bug_622303_persistent_filters.js]
@@ -275,7 +268,6 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_bug_642108_pruneTest.js]
 [browser_webconsole_autocomplete_and_selfxss.js]
 [browser_webconsole_bug_644419_log_limits.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_bug_646025_console_file_location.js]
 [browser_webconsole_bug_651501_document_body_autocomplete.js]
 [browser_webconsole_bug_653531_highlighter_console_helper.js]
@@ -297,7 +289,6 @@ skip-if = true # Bug 1110500 - mouse event failure in test
 [browser_webconsole_bug_764572_output_open_url.js]
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_bug_766001_JS_Console_in_Debugger.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1042253 - webconsole e10s tests (expectUncaughtException)
 [browser_webconsole_bug_770099_violation.js]
 [browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js]
 skip-if = buildapp == 'mulet'
@@ -359,7 +350,6 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout)
 [browser_webconsole_trackingprotection_errors.js]
 tags = trackingprotection
 [browser_webconsole_view_source.js]
-skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException)
 [browser_webconsole_reflow.js]
 [browser_webconsole_log_file_filter.js]
 [browser_webconsole_expandable_timestamps.js]

browser/devtools/webconsole/test/browser_cached_messages.js

@@ -11,11 +11,15 @@
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
                  "test/test-webconsole-error-observer.html";
 
+// On e10s, the exception is triggered in child process
+// and is ignored by test harness
+if (!Services.appinfo.browserTabsRemoteAutostart) {
+  expectUncaughtException();
+}
+
 function test() {
   waitForExplicitFinish();
 
-  expectUncaughtException();
-
   loadTab(TEST_URI).then(testOpenUI);
 }
 

browser/devtools/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js

@@ -30,7 +30,12 @@ function test() {
     let button = content.document.querySelector("button");
     ok(button, "button found");
 
-    expectUncaughtException();
+    // On e10s, the exception is triggered in child process
+    // and is ignored by test harness
+    if (!Services.appinfo.browserTabsRemoteAutostart) {
+      expectUncaughtException();
+    }
+
     EventUtils.sendMouseEvent({type: "click"}, button, content);
 
     yield waitForMessages({

browser/devtools/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js

@@ -17,7 +17,11 @@ let test = asyncTest(function* () {
 
   let hud = yield openConsole();
 
-  expectUncaughtException();
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   content.location = TEST_URI;
 

browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js

@@ -172,7 +172,11 @@ function testNext() {
           pageError = true;
           startNextTest();
         });
-        expectUncaughtException();
+        // On e10s, the exception is triggered in child process
+        // and is ignored by test harness
+        if (!Services.appinfo.browserTabsRemoteAutostart) {
+          expectUncaughtException();
+        }
       } else {
         pageError = true;
       }

browser/devtools/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js

@@ -21,7 +21,11 @@ function test() {
 
     let button = content.document.querySelector("button");
 
-    expectUncaughtException();
+    // On e10s, the exception is triggered in child process
+    // and is ignored by test harness
+    if (!Services.appinfo.browserTabsRemoteAutostart) {
+      expectUncaughtException();
+    }
     EventUtils.sendMouseEvent({ type: "click" }, button, content);
 
     yield waitForMessages({

browser/devtools/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js

@@ -16,12 +16,18 @@ const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
 let HUD;
 
 let test = asyncTest(function* () {
-  expectUncaughtException();
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   let { browser } = yield loadTab(TEST_URI);
   HUD = yield openConsole();
 
-  expectUncaughtException();
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   yield reload(browser);
 
@@ -32,12 +38,16 @@ let test = asyncTest(function* () {
   // Close and reopen
   gBrowser.removeCurrentTab();
 
-  expectUncaughtException();
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   let tab = yield loadTab(TEST_URI);
   HUD = yield openConsole();
 
-  expectUncaughtException();
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   yield reload(tab.browser);
 

browser/devtools/webconsole/test/browser_webconsole_bug_601177_log_levels.js

@@ -22,7 +22,11 @@ let test = asyncTest(function* () {
 
   let hud = yield openConsole();
 
-  expectUncaughtException();
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   yield testLogLevels(hud);
 

browser/devtools/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js

@@ -17,7 +17,11 @@ let test = asyncTest(function* () {
 
   let hud = yield openConsole();
 
-  expectUncaughtException();
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   content.location = TEST_URI2;
 

browser/devtools/webconsole/test/browser_webconsole_bug_644419_log_limits.js

@@ -28,7 +28,11 @@ let test = asyncTest(function* () {
 
   let loaded = loadBrowser(browser);
 
-  expectUncaughtException();
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
 
   content.location = TEST_URI;
   yield loaded;
@@ -108,7 +112,9 @@ function testJsLimits2() {
     let script = content.document.createElement("script");
     script.text = "fubar" + i + ".bogus(6);";
 
-    expectUncaughtException();
+    if (!Services.appinfo.browserTabsRemoteAutostart) {
+      expectUncaughtException();
+    }
     head.insertBefore(script, head.firstChild);
   }
 

browser/devtools/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js

@@ -18,7 +18,11 @@ function test() {
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
-    expectUncaughtException();
+    // On e10s, the exception is triggered in child process
+    // and is ignored by test harness
+    if (!Services.appinfo.browserTabsRemoteAutostart) {
+      expectUncaughtException();
+    }
 
     let {tab} = yield loadTab(TEST_URI);
     hud = yield openConsole(tab);

browser/devtools/webconsole/test/browser_webconsole_view_source.js

@@ -21,7 +21,11 @@ add_task(function*() {
   let button = content.document.querySelector("button");
   ok(button, "we have the button on the page");
 
-  expectUncaughtException();
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
   EventUtils.sendMouseEvent({ type: "click" }, button, content);
 
   let { panelWin: { DebuggerView } } = yield openDebugger();