From 705d014bc83536fa1528b8d458c5cc52797f57c5 Mon Sep 17 00:00:00 2001 From: Jason Orendorff Date: Tue, 12 Mar 2019 01:53:37 +0000 Subject: [PATCH] Bug 1534304 - Proper fix for a race condition in an about:debugging test. r=daisuke Differential Revision: https://phabricator.services.mozilla.com/D22996 --HG-- extra : moz-landing-system : lando --- .../browser_aboutdebugging_telemetry_runtime_updates.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates.js b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates.js index 8de1f8aa5d46..1b2b550d5429 100644 --- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates.js +++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates.js @@ -95,10 +95,6 @@ add_task(async function testUsbRuntimeUpdates() { info("Remove runtime 1"); await removeUsbRuntime(USB_RUNTIME_1, mocks, document); - // Wait a tick for telementry events to settle. (removeUsbRuntime only waits - // for the UI to update.) - await undefined; - checkTelemetryEvents([ { method: "runtime_disconnected", extras: runtime1ConnectedExtras }, { method: "runtime_removed", extras: runtime1Extras }, @@ -130,5 +126,6 @@ async function addUsbRuntime(runtime, mocks, doc) { async function removeUsbRuntime(runtime, mocks, doc) { mocks.removeRuntime(runtime.id); mocks.emitUSBUpdate(); - await waitUntil(() => !findSidebarItemByText(runtime.shortName, doc)); + await waitUntil(() => !findSidebarItemByText(runtime.name, doc) && + !findSidebarItemByText(runtime.shortName, doc)); }