Backed out changeset 064f2ad7ca3b (bug 1379292)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 11 Jul 2017 19:39:38 +0200
changeset 368274 85332a69ae0cbad6556541883960c517b1b86a03
parent 368273 051284a3564e0a798fea06a7dde26300ac2288a6
child 368275 0580a54610160c86c488010e00c4b89a61537250
push id46265
push userarchaeopteryx@coole-files.de
push dateTue, 11 Jul 2017 17:40:31 +0000
treeherderautoland@0580a5461016 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1379292
milestone56.0a1
backs out064f2ad7ca3bcd37df0ca60dd870a722ca96c756
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
Backed out changeset 064f2ad7ca3b (bug 1379292)
toolkit/components/telemetry/tests/marionette/tests/client/test_main_tab_scalars.py
--- a/toolkit/components/telemetry/tests/marionette/tests/client/test_main_tab_scalars.py
+++ b/toolkit/components/telemetry/tests/marionette/tests/client/test_main_tab_scalars.py
@@ -1,38 +1,27 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette_driver.wait import Wait
-
 from telemetry_harness.testcase import TelemetryTestCase
 
 
 class TestMainTabScalars(TelemetryTestCase):
 
     def test_main_tab_scalars(self):
-        wait = Wait(self.marionette, 10)
-
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             tab1 = self.browser.tabbar.selected_tab
             tab2 = self.browser.tabbar.open_tab()
-            wait.until(lambda m: len(self.browser.tabbar.tabs) == 2)
             self.browser.tabbar.switch_to(tab2)
             tab3 = self.browser.tabbar.open_tab()
-            wait.until(lambda m: len(self.browser.tabbar.tabs) == 3)
             self.browser.tabbar.switch_to(tab3)
             self.browser.tabbar.close_tab(tab3, force=True)
-            wait.until(lambda m: len(self.browser.tabbar.tabs) == 2)
             self.browser.tabbar.close_tab(tab2, force=True)
-            wait.until(lambda m: len(self.browser.tabbar.tabs) == 1)
             self.browser.tabbar.switch_to(tab1)
         self.restart_browser()
-        ping = self.wait_for_ping(lambda p: p['type'] == 'main'
-                                            and p['payload']['info']['reason'] == 'shutdown')
+        ping = self.wait_for_ping()
         assert ping['type'] == 'main'
         assert ping['clientId'] == self.client_id
         scalars = ping['payload']['processes']['parent']['scalars']
         assert scalars['browser.engagement.max_concurrent_tab_count'] == 3
         assert scalars['browser.engagement.tab_open_event_count'] == 2
         assert scalars['browser.engagement.max_concurrent_window_count'] == 1
-
-