Merge mozilla-central to autoland
authorarthur.iakab <aiakab@mozilla.com>
Thu, 26 Apr 2018 02:02:47 +0300
changeset 471679 205817abe4d5568b8ea1ecd72a7f3795804e10b3
parent 471678 6c411b0781cc2f9fbf4c8b29dfc2cfa3af0b1301 (current diff)
parent 471596 99c19a66c3a2fbf8108d4b8a161cded31e948409 (diff)
child 471680 8520ed7853e67f2afc2d8dcf3b275023e910a174
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland
--- a/devtools/client/webconsole/test/mochitest/browser_webconsole_split.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_split.js
@@ -24,24 +24,16 @@ add_task(async function() {
 
   info("Testing host types");
   checkHostType(Toolbox.HostType.BOTTOM);
   checkToolboxUI();
   await toolbox.switchHost(Toolbox.HostType.SIDE);
   checkHostType(Toolbox.HostType.SIDE);
   checkToolboxUI();
   await toolbox.switchHost(Toolbox.HostType.WINDOW);
-
-  // checkHostType, below,  will open the meatball menu to read the "Split
-  // console" menu item label. However, if we've just opened a new window then
-  // on some platforms when we switch focus to the new window we might end up
-  // triggering the auto-close behavior on the menu popup. To avoid that, wait
-  // a moment before querying the menu.
-  await new Promise(resolve => requestIdleCallback(resolve));
-
   checkHostType(Toolbox.HostType.WINDOW);
   checkToolboxUI();
   await toolbox.switchHost(Toolbox.HostType.BOTTOM);
 
   async function testConsoleLoadOnDifferentPanel() {
     info("About to check console loads even when non-webconsole panel is open");
 
     await openPanel("inspector");