From dc449a150cc6efa13510ad20bceb826092a0c916 Mon Sep 17 00:00:00 2001 From: James Graham Date: Thu, 9 Apr 2020 13:48:15 +0000 Subject: [PATCH] Bug 1628607 - Fix teardown in SingleInstanceManager, r=maja_zf Differential Revision: https://phabricator.services.mozilla.com/D70331 --HG-- extra : moz-landing-system : lando --- .../tests/tools/wptrunner/wptrunner/browsers/firefox.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py index 3fbfbfaac813..bfc3ab9a2be5 100644 --- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py +++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py @@ -319,7 +319,7 @@ class SingleInstanceManager(FirefoxInstanceManager): return self.current def teardown(self, force=False): - for instance, skip_marionette in [self.previous, self.current]: + for instance in [self.previous, self.current]: if instance: instance.stop(force) instance.cleanup() @@ -345,11 +345,14 @@ class PreloadInstanceManager(FirefoxInstanceManager): return self.current def teardown(self, force=False): - for instance, skip_marionette in [(self.previous, False), (self.current, False), (self.pending, True)]: + for instance, skip_marionette in [(self.previous, False), + (self.current, False), + (self.pending, True)]: if instance: instance.stop(force, skip_marionette=skip_marionette) instance.cleanup() + class BrowserInstance(object): shutdown_timeout = 70