Bug 1337743 - Make session and param checks safer against falsy values; r?whimboo
MozReview-Commit-ID: 8M79WmiRfkE
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -608,17 +608,17 @@ class Marionette(object):
self.timeout = Timeouts(self)
@property
def profile_path(self):
if self.instance and self.instance.profile:
return self.instance.profile.profile
def cleanup(self):
- if self.session:
+ if self.session is not None:
try:
self.delete_session()
except (errors.MarionetteException, IOError):
# These exceptions get thrown if the Marionette server
# hit an exception/died or the connection died. We can
# do no further server-side cleanup in this case.
pass
if self.instance:
@@ -708,17 +708,17 @@ class Marionette(object):
"""
if not self.session_id and name != "newSession":
raise errors.MarionetteException("Please start a session")
try:
if self.protocol < 3:
data = {"name": name}
- if params:
+ if params is not None:
data["parameters"] = params
self.client.send(data)
msg = self.client.receive()
else:
msg = self.client.request(name, params)
except IOError: