Bug 1316381 - Re-enable browser_toolbox_swap_browsers.js test. r=ochameau
MozReview-Commit-ID: LNwvso1tBL8
--- a/devtools/client/responsive.html/test/browser/browser.ini
+++ b/devtools/client/responsive.html/test/browser/browser.ini
@@ -32,12 +32,11 @@ support-files =
[browser_permission_doorhanger.js]
[browser_resize_cmd.js]
[browser_screenshot_button.js]
[browser_tab_close.js]
[browser_tab_remoteness_change.js]
[browser_toolbox_computed_view.js]
[browser_toolbox_rule_view.js]
[browser_toolbox_swap_browsers.js]
-skip-if = true # Bug 1315042
[browser_touch_simulation.js]
[browser_viewport_basics.js]
[browser_window_close.js]
--- a/devtools/client/responsive.html/test/browser/browser_toolbox_swap_browsers.js
+++ b/devtools/client/responsive.html/test/browser/browser_toolbox_swap_browsers.js
@@ -34,45 +34,49 @@ add_task(function* setup() {
yield SpecialPowers.pushPrefEnv({
set: [["dom.ipc.processCount", 1]]
});
});
add_task(function* () {
let tab = yield addTab(TEST_URL);
+ let tabsInDifferentProcesses = E10S_MULTI_ENABLED &&
+ (gBrowser.tabs[0].linkedBrowser.frameLoader.childID !=
+ gBrowser.tabs[1].linkedBrowser.frameLoader.childID);
+
info("Open toolbox outside RDM");
{
// 0: No DevTools connections yet
yield checkServerConnectionCount(tab.linkedBrowser, 0,
"0: No DevTools connections yet");
let { toolbox } = yield openInspector();
- if (E10S_MULTI_ENABLED) {
+ if (tabsInDifferentProcesses) {
// 1: Two tabs open, but only one per content process
yield checkServerConnectionCount(tab.linkedBrowser, 1,
"1: Two tabs open, but only one per content process");
} else {
// 2: One for each tab (starting tab plus the one we opened)
yield checkServerConnectionCount(tab.linkedBrowser, 2,
"2: One for each tab (starting tab plus the one we opened)");
}
yield checkToolbox(tab, "outside RDM");
let { ui } = yield openRDM(tab);
- if (E10S_MULTI_ENABLED) {
+ if (tabsInDifferentProcesses) {
// 2: RDM UI adds an extra connection, 1 + 1 = 2
yield checkServerConnectionCount(ui.getViewportBrowser(), 2,
"2: RDM UI uses an extra connection");
} else {
// 3: RDM UI adds an extra connection, 2 + 1 = 3
yield checkServerConnectionCount(ui.getViewportBrowser(), 3,
"3: RDM UI uses an extra connection");
}
yield checkToolbox(tab, "after opening RDM");
yield closeRDM(tab);
- if (E10S_MULTI_ENABLED) {
+ if (tabsInDifferentProcesses) {
// 1: RDM UI closed, return to previous connection count
yield checkServerConnectionCount(tab.linkedBrowser, 1,
"1: RDM UI closed, return to previous connection count");
} else {
// 2: RDM UI closed, return to previous connection count
yield checkServerConnectionCount(tab.linkedBrowser, 2,
"2: RDM UI closed, return to previous connection count");
}
@@ -88,28 +92,28 @@ add_task(function* () {
// 0: No DevTools connections yet
yield checkServerConnectionCount(tab.linkedBrowser, 0,
"0: No DevTools connections yet");
let { ui } = yield openRDM(tab);
// 1: RDM UI uses an extra connection
yield checkServerConnectionCount(ui.getViewportBrowser(), 1,
"1: RDM UI uses an extra connection");
let { toolbox } = yield openInspector();
- if (E10S_MULTI_ENABLED) {
+ if (tabsInDifferentProcesses) {
// 2: Two tabs open, but only one per content process
yield checkServerConnectionCount(ui.getViewportBrowser(), 2,
"2: Two tabs open, but only one per content process");
} else {
// 3: One for each tab (starting tab plus the one we opened)
yield checkServerConnectionCount(ui.getViewportBrowser(), 3,
"3: One for each tab (starting tab plus the one we opened)");
}
yield checkToolbox(tab, ui.getViewportBrowser(), "inside RDM");
yield closeRDM(tab);
- if (E10S_MULTI_ENABLED) {
+ if (tabsInDifferentProcesses) {
// 1: RDM UI closed, one less connection
yield checkServerConnectionCount(tab.linkedBrowser, 1,
"1: RDM UI closed, one less connection");
} else {
// 2: RDM UI closed, one less connection
yield checkServerConnectionCount(tab.linkedBrowser, 2,
"2: RDM UI closed, one less connection");
}