Bug 1534499 - Wait for hiding both shortName and name when remove USB runtime in tests r=daisuke
authorMellina Yonashiro <yonashiro.mellina@gmail.com>
Thu, 21 Mar 2019 23:05:08 +0000
changeset 465561 db33a524a097cb94fed9b5c8520ffc17093a9583
parent 465560 bf46557c98cb283a1ff94cff5a95baceba1b5b9a
child 465562 40832d18745436bf9521334193728de42f3d67d5
push id35744
push userapavel@mozilla.com
push dateFri, 22 Mar 2019 16:44:08 +0000
treeherdermozilla-central@e66a2b59914d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdaisuke
bugs1534499
milestone68.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
Bug 1534499 - Wait for hiding both shortName and name when remove USB runtime in tests r=daisuke Differential Revision: https://phabricator.services.mozilla.com/D23763
devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_persist_connection.js
devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates_multi.js
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_persist_connection.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_persist_connection.js
@@ -59,13 +59,14 @@ async function testRemoteClientPersistCo
 
   // Remove the runtime without emitting an update.
   // This is what happens today when we simply close Firefox for Android.
   info("Remove the runtime from the list of remote runtimes");
   mocks.removeRuntime(id);
 
   info("Emit 'closed' on the client and wait for the sidebar item to disappear");
   client._eventEmitter.emit("closed");
-  await waitUntil(() => !findSidebarItemByText(sidebarName, document));
+  await waitUntil(() => !findSidebarItemByText(sidebarName, document) &&
+                      !findSidebarItemByText(runtimeName, document));
 
   info("Remove the tab");
   await removeTab(tab);
 }
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates_multi.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_telemetry_runtime_updates_multi.js
@@ -72,18 +72,20 @@ add_task(async function() {
     { method: "runtime_added", extras: RUNTIME_1_EXTRAS },
     { method: "runtime_added", extras: RUNTIME_2_EXTRAS },
   ], sessionId);
 
   info("Remove both runtimes at once to simulate a device disconnection");
   mocks.removeRuntime(USB_RUNTIME_1.id);
   mocks.removeRuntime(USB_RUNTIME_2.id);
   mocks.emitUSBUpdate();
-  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_1.shortName, document));
-  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_2.shortName, document));
+  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_1.name, document) &&
+                        !findSidebarItemByText(USB_RUNTIME_1.shortName, document));
+  await waitUntil(() => !findSidebarItemByText(USB_RUNTIME_2.name, document) &&
+                        !findSidebarItemByText(USB_RUNTIME_2.shortName, document));
 
   checkTelemetryEvents([
     { method: "runtime_removed", extras: RUNTIME_1_EXTRAS },
     { method: "runtime_removed", extras: RUNTIME_2_EXTRAS },
     { method: "device_removed", extras: DEVICE_A_EXTRAS },
   ], sessionId);
 
   await removeTab(tab);