Bug 1628607 - Fix teardown in SingleInstanceManager, r=maja_zf

Differential Revision: https://phabricator.services.mozilla.com/D70331

--HG--
extra : moz-landing-system : lando
This commit is contained in:
James Graham 2020-04-09 13:48:15 +00:00
Родитель c5411d0ed9
Коммит dc449a150c
1 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -319,7 +319,7 @@ class SingleInstanceManager(FirefoxInstanceManager):
return self.current return self.current
def teardown(self, force=False): def teardown(self, force=False):
for instance, skip_marionette in [self.previous, self.current]: for instance in [self.previous, self.current]:
if instance: if instance:
instance.stop(force) instance.stop(force)
instance.cleanup() instance.cleanup()
@ -345,11 +345,14 @@ class PreloadInstanceManager(FirefoxInstanceManager):
return self.current return self.current
def teardown(self, force=False): 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: if instance:
instance.stop(force, skip_marionette=skip_marionette) instance.stop(force, skip_marionette=skip_marionette)
instance.cleanup() instance.cleanup()
class BrowserInstance(object): class BrowserInstance(object):
shutdown_timeout = 70 shutdown_timeout = 70