Bug 1375259 - Fix FennecInstance.close() for removal of restart keyword.
On
bug 1373635 the restart keyword has been removed from
GeckoInstance.close(), but it was missed for FennecInstance,
which calls this method.
MozReview-Commit-ID: 5cEFJ6JXIVl
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -253,17 +253,16 @@ class GeckoInstance(object):
def close(self, clean=False):
"""
Close the managed Gecko process.
Depending on self.runner_class, setting `clean` to True may also kill
the emulator process in which this instance is running.
- :param restart: If True, assume this is being called by restart method.
:param clean: If True, also perform runner cleanup.
"""
if self.runner:
self.runner.stop()
if clean:
self.runner.cleanup()
if clean and self.profile:
@@ -386,27 +385,26 @@ class FennecInstance(GeckoInstance):
"logdir": self.workspace or os.getcwd(),
"serial": self.serial,
}
if self.avd:
runner_args["avd"] = self.avd
return runner_args
- def close(self, restart=False, clean=False):
+ def close(self, clean=False):
"""
Close the managed Gecko process.
If `clean` is True and the Fennec instance is running in an
emulator managed by mozrunner, this will stop the emulator.
- :param restart: If True, assume this is being called by restart method.
:param clean: If True, also perform runner cleanup.
"""
- super(FennecInstance, self).close(restart, clean)
+ super(FennecInstance, self).close(clean)
if clean and self.runner and self.runner.device.connected:
self.runner.device.dm.remove_forward(
"tcp:{}".format(self.marionette_port))
class DesktopInstance(GeckoInstance):
desktop_prefs = {
# Disable application updates