From 6c3d75cad6638ece7607c4862822a89e1e3bf2ae Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Mon, 18 Feb 2019 07:03:21 +0000 Subject: [PATCH] Bug 1528140 - Wait for requests to settle after aboutdebugging tab is selected;r=daisuke We should wait until the selected tab has been updated because we fetch tabs when the selected index changes. Differential Revision: https://phabricator.services.mozilla.com/D19959 --HG-- extra : moz-landing-system : lando --- .../client/aboutdebugging-new/test/browser/head.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/devtools/client/aboutdebugging-new/test/browser/head.js b/devtools/client/aboutdebugging-new/test/browser/head.js index 109a53b26244..465667fc49fe 100644 --- a/devtools/client/aboutdebugging-new/test/browser/head.js +++ b/devtools/client/aboutdebugging-new/test/browser/head.js @@ -91,11 +91,14 @@ async function openAboutDevtoolsToolbox(doc, tab, win) { } async function closeAboutDevtoolsToolbox(devtoolsTab, win) { + info("Close about:devtools-toolbox page"); + const onToolboxDestroyed = gDevTools.once("toolbox-destroyed"); await removeTab(devtoolsTab); - await Promise.all([ - waitForRequestsToSettle(win.AboutDebugging.store), - gDevTools.once("toolbox-destroyed"), - ]); + await onToolboxDestroyed; + // Changing the tab will also trigger a request to list tabs, so wait until the selected + // tab has changed to wait for requests to settle. + await waitUntil(() => gBrowser.selectedTab !== devtoolsTab); + await waitForRequestsToSettle(win.AboutDebugging.store); } async function reloadAboutDebugging(tab) {