wait_for_requests.diff

diff --git a/devtools/client/framework/test/browser_toolbox_window_reload_target.js b/devtools/client/framework/test/browser_toolbox_window_reload_target.js
--- a/devtools/client/framework/test/browser_toolbox_window_reload_target.js
+++ b/devtools/client/framework/test/browser_toolbox_window_reload_target.js
@@ -60,16 +60,17 @@ add_task(async function() {
     await testOneTool(toolbox, toolID);
   }
 
   info("Switch back to docked mode");
   await toolbox.switchHost(Toolbox.HostType.BOTTOM);
 
   gBrowser.selectedBrowser.messageManager.removeMessageListener("devtools:test:load", reloadCounter);
 
+  await target.client.waitForRequestsToSettle();
   await toolbox.destroy();
   gBrowser.removeCurrentTab();
 });
 
 async function testOneTool(toolbox, toolID) {
   info(`Select tool ${toolID}`);
   await toolbox.selectTool(toolID);
 
@@ -104,31 +105,23 @@ function testReload(shortcut, toolbox, t
 
     if (toolbox.walker) {
       observer.onMutation = observer.onMutation.bind(observer);
       toolbox.walker.on("mutations", observer.onMutation);
     } else {
       observer.isReady = () => true;
     }
 
-    // If we have a jsdebugger panel, wait for it to complete its reload
-    const jsdebugger = toolbox.getPanel("jsdebugger");
-    let onReloaded = Promise.resolve;
-    if (jsdebugger) {
-      onReloaded = jsdebugger.once("reloaded");
-    }
-
     const complete = async () => {
       mm.removeMessageListener("devtools:test:load", complete);
       // Wait for the documentUnload and newRoot were fired.
       await waitUntil(() => observer.isReady());
       if (toolbox.walker) {
         toolbox.walker.off("mutations", observer.onMutation);
       }
-      await onReloaded;
       resolve();
     };
 
     mm.addMessageListener("devtools:test:load", complete);
 
     toolbox.win.focus();
     synthesizeKeyShortcut(L10N.getStr(shortcut), toolbox.win);
     reloadsSent++;