Backed out changeset e123b6e47340 (bug 1379292) for linting failures in test_main_tab_scalars.py. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 11 Jul 2017 19:40:17 +0200
changeset 368275 0580a54610160c86c488010e00c4b89a61537250
parent 368274 85332a69ae0cbad6556541883960c517b1b86a03
child 368276 c6accdcc2c44fee3a3477055be56f41357c2c17b
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)
reviewersbackout
bugs1379292
milestone56.0a1
backs oute123b6e47340e0fba6d6d8c4d5f64b665b5e72a0
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 e123b6e47340 (bug 1379292) for linting failures in test_main_tab_scalars.py. r=backout
toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
--- a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
+++ b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
@@ -45,26 +45,22 @@ class TelemetryTestCase(PuppeteerMixin, 
             'toolkit.telemetry.log.level': 0,
             'toolkit.telemetry.log.dump': True,
             'toolkit.telemetry.send.overrideOfficialCheck': True
         }
 
         # Firefox will be forced to restart with the prefs enforced.
         self.marionette.enforce_gecko_prefs(telemetry_prefs)
 
-    def wait_for_ping(self, ping_filter_func):
+    def wait_for_ping(self):
         if len(self.ping_list) == 0:
             try:
                 Wait(self.marionette, 60).until(lambda t: len(self.ping_list) > 0)
             except Exception as e:
                 self.fail('Error generating ping: {}'.format(e.message))
-
-        # Filter pings based on type and reason to make sure right ping is captured.
-        self.ping_list = [p for p in self.ping_list if ping_filter_func(p)]
-        assert len(self.ping_list) == 1
         return self.ping_list.pop()
 
     def toggle_update_pref(self):
         value = self.marionette.get_pref('app.update.enabled')
         self.marionette.enforce_gecko_prefs({'app.update.enabled': not value})
 
     def restart_browser(self):
         """Restarts browser while maintaining the same profile and session."""