bug 1504478: marionette: use SingleTap and AcceptConnections in Python client; r=whimboo a=test-only
authorAndreas Tolfsen <ato@sny.no>
Mon, 05 Nov 2018 18:40:33 +0000
changeset 498338 f81a913aa2dc0e83d09684d1e3b2ac1f5409a14f
parent 498337 f8bf790493a38e23a4aa0efd0fa0f871aff6b296
child 498339 d32e8117432436768670dda888bd93cfc989a5bf
push id10115
push userrgurzau@mozilla.com
push dateTue, 06 Nov 2018 11:07:43 +0000
treeherdermozilla-beta@f81a913aa2dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo, test-only
bugs1504478
milestone64.0
bug 1504478: marionette: use SingleTap and AcceptConnections in Python client; r=whimboo a=test-only 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: {})"