Bug 1418227 - TcpTransport.sock should not be used by consumers. r=automatedtester, a=test-only
authorHenrik Skupin <mail@hskupin.info>
Fri, 17 Nov 2017 10:48:57 +0100
changeset 444861 c0da1f29b298e22178bcf71405f17528a5afe2fb
parent 444860 73e6110048c494a82868859334a332eff364835a
child 444862 4eb0dd155ef28ef6a3b55d91cfa175d0ae919b03
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester, test-only
bugs1418227
milestone58.0
Bug 1418227 - TcpTransport.sock should not be used by consumers. r=automatedtester, a=test-only The socket is managed by TcpTransport and as such the latter should be used to retrieve the socket timeout. MozReview-Commit-ID: EzXCwDtfGvR
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -165,17 +165,17 @@ class MarionetteProtocol(Protocol):
                 pass
 
         self.marionette.switch_to_window(runner_handle)
         if runner_handle != self.runner_handle:
             self.load_runner(protocol)
 
     def wait(self):
         try:
-            socket_timeout = self.marionette.client.sock.gettimeout()
+            socket_timeout = self.marionette.client.socket_timeout
         except AttributeError:
             # This can happen if there was a crash
             return
         if socket_timeout:
             try:
                 self.marionette.timeout.script = socket_timeout / 2
             except (socket.error, IOError):
                 self.logger.debug("Socket closed")