bug 1504478: marionette: use SingleTap and AcceptConnections in Python client; r=whimboo
authorAndreas Tolfsen <ato@sny.no>
Mon, 05 Nov 2018 18:40:33 +0000
changeset 444455 341265ae91c19ba7925609dc8432f4da0b9aab76
parent 444454 2030d86b1ee8efd585ceb245eba10d3dcf124e7f
child 444456 bfce81a6090ed29c63811733f503727a8707ccdc
push id72348
push useratolfsen@mozilla.com
push dateMon, 05 Nov 2018 18:43:38 +0000
treeherderautoland@a1fcca885ad4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1504478
milestone65.0a1
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
bug 1504478: marionette: use SingleTap and AcceptConnections in Python client; r=whimboo The singleTap and acceptConnections commands are deprecated in favour of, respectively, Marionette:SingleTap and Marionette:AcceptConnections. Differential Revision: https://phabricator.services.mozilla.com/D10835
testing/marionette/client/marionette_driver/marionette.py
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -97,17 +97,17 @@ class HTMLElement(object):
         """Simulates a set of tap events on the element.
 
         :param x: X coordinate of tap event.  If not given, default to
             the centre of the element.
         :param y: Y coordinate of tap event. If not given, default to
             the centre of the element.
         """
         body = {"id": self.id, "x": x, "y": y}
-        self.marionette._send_message("singleTap", body)
+        self.marionette._send_message("Marionette:SingleTap", body)
 
     @property
     def text(self):
         """Returns the visible text of the element, and its child elements."""
         body = {"id": self.id}
         return self.marionette._send_message("WebDriver:GetElementText",
                                              body, key="value")
 
@@ -1191,17 +1191,17 @@ class Marionette(object):
                                     check_process_status=False)
             except socket.timeout:
                 exc, val, tb = sys.exc_info()
 
                 if self.instance.runner.returncode is None:
                     # The process is still running, which means the shutdown
                     # request was not correct or the application ignored it.
                     # Allow Marionette to accept connections again.
-                    self._send_message("acceptConnections", {"value": True})
+                    self._send_message("Marionette:AcceptConnections", {"value": True})
 
                     message = "Process still running {}s after restart request"
                     reraise(exc, message.format(self.shutdown_timeout), tb)
 
                 else:
                     # The process shutdown but didn't start again.
                     self.cleanup()
                     msg = "Process unexpectedly quit without restarting (exit code: {})"