commit c4ed3e87f339b4caddceca5a1afa4a0453c4b485
parent 3cfc7702e97072b45e5cc42123972a050788ecb0
Author: Cristina Horotan <chorotan@mozilla.com>
Date: Thu, 16 Oct 2025 14:32:36 +0300
Revert "Bug 1986704 - [devtools] Reduce markupview timeout to wait for selector on navigation to 1000ms r=devtools-reviewers,nchevobbe" for causing dt failures on browser_inspector_command_findNodeFrontFromSelectors.js
This reverts commit 1437c3b7d39330c274830ff427354a01f5a472c7.
Diffstat:
4 files changed, 19 insertions(+), 95 deletions(-)
diff --git a/devtools/client/inspector/test/browser_inspector_reload_iframe.js b/devtools/client/inspector/test/browser_inspector_reload_iframe.js
@@ -9,34 +9,25 @@
// We're loading an image that would take a few second to load so the iframe won't have
// its readyState to "complete" (it should be "interactive").
// That was causing some issue, see Bug 1733539.
-
-function getTestURI(delay) {
- const IMG_URL = `${URL_ROOT_COM_SSL}sjs_slow-loading-image.sjs?delay=${delay}`;
- const FRAME_URI =
- "data:text/html;charset=utf-8," +
- encodeURI(`
- <div id="in-frame">div in the iframe</div>
- <img src="${IMG_URL}"></img>
- `);
- const HTML = `
- <iframe src="${FRAME_URI}"></iframe>
- `;
-
- return "data:text/html;charset=utf-8," + encodeURI(HTML);
-}
+const IMG_URL = URL_ROOT_COM_SSL + "sjs_slow-loading-image.sjs";
+const FRAME_URI =
+ "data:text/html;charset=utf-8," +
+ encodeURI(`
+ <div id="in-frame">div in the iframe</div>
+ <img src="${IMG_URL}"></img>
+ `);
+const HTML = `
+ <iframe src="${FRAME_URI}"></iframe>
+`;
+
+const TEST_URI = "data:text/html;charset=utf-8," + encodeURI(HTML);
add_task(async function () {
- const { getSystemInfo } = require("resource://devtools/shared/system.js");
-
- const INSPECTOR_FIND_NODE_TIMEOUT = 1000 * getSystemInfo().timeoutMultiplier;
- const TEST_URI = getTestURI(INSPECTOR_FIND_NODE_TIMEOUT / 10);
- const SLOW_TEST_URI = getTestURI(INSPECTOR_FIND_NODE_TIMEOUT + 5000);
-
const { inspector } = await openInspectorForURL(TEST_URI);
await selectNodeInFrames(["iframe", "#in-frame"], inspector);
- let markupLoaded = inspector.once("markuploaded");
+ const markupLoaded = inspector.once("markuploaded");
info("Reloading page.");
await navigateTo(TEST_URI);
@@ -54,42 +45,4 @@ add_task(async function () {
reloadedNodeFront,
"#in-frame selected after reload."
);
-
- info("Check that markup view is not blocked for a page with a slow iframe");
- await navigateTo(SLOW_TEST_URI);
- await selectNodeInFrames(["iframe", "#in-frame"], inspector);
-
- markupLoaded = inspector.once("markuploaded");
-
- info("Reloading page.");
- const onNavigate = navigateTo(SLOW_TEST_URI);
-
- info("Waiting for markupview to load after reload.");
- await markupLoaded;
-
- info("Check that the navigation is not done yet");
- ok(
- !(await hasPromiseResolved(onNavigate)),
- "Navigation to page with slow iframe is not done yet"
- );
-
- const bodyNodeFront = await getNodeFrontInFrames(["body"], inspector);
- is(
- inspector.selection.nodeFront,
- bodyNodeFront,
- "Iframe was too slow to load, the markup view selected body as fallback"
- );
-
- await onNavigate;
});
-
-async function hasPromiseResolved(promise) {
- let resolved = false;
-
- // Note that the catch() is only here to avoid leaking promise rejections.
- // In all cases the resolved flag should be successfully flipped in finally().
- promise.finally(() => (resolved = true)).catch(() => {});
- // Make sure microtasks have time to run.
- await new Promise(resolve => Services.tm.dispatchToMainThread(resolve));
- return resolved;
-}
diff --git a/devtools/client/inspector/test/browser_inspector_reload_nested_iframe.js b/devtools/client/inspector/test/browser_inspector_reload_nested_iframe.js
@@ -8,7 +8,7 @@
const NESTED_IFRAME_URL = `https://example.com/document-builder.sjs?html=${encodeURIComponent(
"<h3>second level iframe</h3>"
-)}&delay=100`;
+)}&delay=500`;
const TEST_URI = `data:text/html;charset=utf-8,
<h1>Top-level</h1>
diff --git a/devtools/shared/commands/inspector/inspector-command.js b/devtools/shared/commands/inspector/inspector-command.js
@@ -17,8 +17,6 @@ loader.lazyRequireGetter(
true
);
-const { getSystemInfo } = require("resource://devtools/shared/system.js");
-
class InspectorCommand {
constructor({ commands }) {
this.commands = commands;
@@ -178,14 +176,14 @@ class InspectorCommand {
* Several selectors can be needed if the element is nested in frames
* and not directly in the root document.
* @param {Integer} timeoutInMs
- * The maximum number of ms the function should run (defaults to 1000).
+ * The maximum number of ms the function should run (defaults to 5000).
* If it exceeds this, the returned promise will resolve with `null`.
* @return {Promise<NodeFront|null>} a promise that resolves when the node front is found
* for selection using inspector tools. It resolves with the deepest frame document
* that could be retrieved when the "final" nodeFront couldn't be found in the page.
* It resolves with `null` when the function runs for more than timeoutInMs.
*/
- async findNodeFrontFromSelectors(nodeSelectors, timeoutInMs = 1000) {
+ async findNodeFrontFromSelectors(nodeSelectors, timeoutInMs = 5000) {
if (
!nodeSelectors ||
!Array.isArray(nodeSelectors) ||
@@ -253,9 +251,9 @@ class InspectorCommand {
// Since this is only used for re-setting a selection after a page reloads, we can
// put a timeout, in case there's an iframe that would take too much time to load,
// and prevent the markup view to be populated.
- const onTimeout = new Promise(res =>
- setTimeout(res, timeoutInMs * getSystemInfo().timeoutMultiplier)
- ).then(() => null);
+ const onTimeout = new Promise(res => setTimeout(res, timeoutInMs)).then(
+ () => null
+ );
const onQuerySelectors = querySelectors(rootNodeFront);
return Promise.race([onTimeout, onQuerySelectors]);
}
diff --git a/devtools/shared/system.js b/devtools/shared/system.js
@@ -9,7 +9,6 @@ loader.lazyRequireGetter(
"resource://devtools/server/devtools-server.js",
true
);
-loader.lazyRequireGetter(this, "flags", "resource://devtools/shared/flags.js");
const lazy = {};
ChromeUtils.defineESModuleGetters(
lazy,
@@ -158,9 +157,6 @@ function getSystemInfo() {
// Update channel
channel: lazy.AppConstants.MOZ_UPDATE_CHANNEL,
- // Timeout multiplier for tests.
- timeoutMultiplier: getTimeoutMultiplier(),
-
dpi,
useragent,
width,
@@ -203,27 +199,4 @@ function getProfileLocation() {
}
}
-/**
- * Retrieve a timeout multiplier based on the platform. Slow platforms should
- * use a bigger multiplier.
- */
-function getTimeoutMultiplier() {
- // Slow platform checks are only relevant to avoid issues in mochitests.
- if (!flags.testing) {
- return 1;
- }
-
- if (
- lazy.AppConstants.DEBUG ||
- lazy.AppConstants.MOZ_CODE_COVERAGE ||
- lazy.AppConstants.ASAN
- ) {
- return 4;
- }
- if (lazy.AppConstants.TSAN) {
- return 8;
- }
-
- return 1;
-}
exports.getSystemInfo = getSystemInfo;
