Backed out changeset aeb183f1c3f0 (bug 1678663) for causing marionette failures. CLOSED TREE

testing/marionette/client/marionette_driver/transport.py

@@ -160,7 +160,7 @@ class TcpTransport(object):
             try:
                 chunk = self._sock.recv(bytes_to_recv)
                 data += chunk
-            except (TimeoutError, socket.timeout):
+            except socket.timeout:
                 pass
             else:
                 if not chunk: