Bug 1305777 - Clean up tests that supported both RDMs. r=ochameau
MozReview-Commit-ID: 4coCvC4KHtn
--- a/devtools/client/shared/test/browser.ini
+++ b/devtools/client/shared/test/browser.ini
@@ -36,16 +36,17 @@ support-files =
head.js
helper_color_data.js
helper_html_tooltip.js
helper_inplace_editor.js
leakhunt.js
test-actor-registry.js
test-actor.js
!/devtools/client/framework/test/shared-head.js
+ !/devtools/client/responsive.html/test/browser/devices.json
[browser_css_angle.js]
[browser_css_color.js]
[browser_cubic-bezier-01.js]
[browser_cubic-bezier-02.js]
[browser_cubic-bezier-03.js]
[browser_cubic-bezier-04.js]
[browser_cubic-bezier-05.js]
@@ -175,17 +176,17 @@ skip-if = e10s # Test intermittently fai
[browser_theme.js]
[browser_tableWidget_basic.js]
[browser_tableWidget_keyboard_interaction.js]
[browser_tableWidget_mouse_interaction.js]
[browser_telemetry_button_eyedropper.js]
[browser_telemetry_button_paintflashing.js]
skip-if = e10s # Bug 937167 - e10s paintflashing
[browser_telemetry_button_responsive.js]
-skip-if = e10s # Bug 1067145 - e10s responsiveview
+skip-if = !e10s # RDM only works for remote tabs
[browser_telemetry_button_scratchpad.js]
[browser_telemetry_sidebar.js]
[browser_telemetry_toolbox.js]
[browser_telemetry_toolboxtabs_canvasdebugger.js]
[browser_telemetry_toolboxtabs_inspector.js]
[browser_telemetry_toolboxtabs_jsdebugger.js]
[browser_telemetry_toolboxtabs_jsprofiler.js]
[browser_telemetry_toolboxtabs_netmonitor.js]
--- a/devtools/client/shared/test/browser_telemetry_button_responsive.js
+++ b/devtools/client/shared/test/browser_telemetry_button_responsive.js
@@ -5,16 +5,36 @@
const TEST_URI = "data:text/html;charset=utf-8," +
"<p>browser_telemetry_button_responsive.js</p>";
// Because we need to gather stats for the period of time that a tool has been
// opened we make use of setTimeout() to create tool active times.
const TOOL_DELAY = 200;
+const asyncStorage = require("devtools/shared/async-storage");
+
+// Toggling the RDM UI involves several docShell swap operations, which are somewhat slow
+// on debug builds. Usually we are just barely over the limit, so a blanket factor of 2
+// should be enough.
+requestLongerTimeout(2);
+
+flags.testing = true;
+Services.prefs.clearUserPref("devtools.responsive.html.displayedDeviceList");
+Services.prefs.setCharPref("devtools.devices.url",
+ "http://example.com/browser/devtools/client/responsive.html/test/browser/devices.json");
+
+registerCleanupFunction(() => {
+ flags.testing = false;
+ Services.prefs.clearUserPref("devtools.devices.url");
+ Services.prefs.clearUserPref("devtools.responsive.html.displayedDeviceList");
+ asyncStorage.removeItem("devtools.devices.url_cache");
+ asyncStorage.removeItem("devtools.devices.local");
+});
+
loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsive.html/manager", true);
add_task(function* () {
yield addTab(TEST_URI);
let Telemetry = loadTelemetryAndRecordLogs();
let target = TargetFactory.forTab(gBrowser.selectedTab);
let toolbox = yield gDevTools.showToolbox(target, "inspector");
--- a/devtools/client/styleeditor/test/browser.ini
+++ b/devtools/client/styleeditor/test/browser.ini
@@ -77,17 +77,17 @@ support-files =
[browser_styleeditor_import.js]
[browser_styleeditor_import_rule.js]
[browser_styleeditor_init.js]
[browser_styleeditor_inline_friendly_names.js]
[browser_styleeditor_loading.js]
[browser_styleeditor_loading_with_containers.js]
[browser_styleeditor_media_sidebar.js]
[browser_styleeditor_media_sidebar_links.js]
-skip-if = e10s && debug # Bug 1252201 - Docshell leak on debug e10s
+skip-if = !e10s || debug # Bug 1252201 - Docshell leak on debug e10s
[browser_styleeditor_media_sidebar_sourcemaps.js]
[browser_styleeditor_missing_stylesheet.js]
[browser_styleeditor_navigate.js]
[browser_styleeditor_new.js]
[browser_styleeditor_nostyle.js]
[browser_styleeditor_opentab.js]
[browser_styleeditor_pretty.js]
[browser_styleeditor_private_perwindowpb.js]
--- a/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js
@@ -100,30 +100,22 @@ function doFinalChecks(editor) {
/* Helpers */
function waitForResizeTo(rdmUI, type, value) {
return new Promise(resolve => {
let onResize = (_, data) => {
if (data[type] != value) {
return;
}
- ResponsiveUIManager.off("content-resize", onResize);
- if (rdmUI.off) {
- rdmUI.off("content-resize", onResize);
- }
+ rdmUI.off("content-resize", onResize);
info(`Got content-resize to a ${type} of ${value}`);
resolve();
};
info(`Waiting for content-resize to a ${type} of ${value}`);
- // Old RDM emits on manager
- ResponsiveUIManager.on("content-resize", onResize);
- // New RDM emits on ui
- if (rdmUI.on) {
- rdmUI.on("content-resize", onResize);
- }
+ rdmUI.on("content-resize", onResize);
});
}
function* getSizing(rdmUI) {
let browser = rdmUI.getViewportBrowser();
let sizing = yield ContentTask.spawn(browser, {}, function* () {
return {
width: content.innerWidth,