Backed out changeset 1e12a866239c (bug 1394381) for busting web-platform-tests. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 06 Sep 2017 18:51:32 +0200
changeset 428693 e37dfd5884b7684c5a174c5c2cae41281f45d775
parent 428692 a4ba970fd7ba3baa2aa3fcee824c1b71a8c71ccc
child 428694 400fec991840a2393be982d7884215066c51449f
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1394381
milestone57.0a1
backs out1e12a866239c8ab6d5ee68c31731d66a54733d81
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
Backed out changeset 1e12a866239c (bug 1394381) for busting web-platform-tests. r=backout on a CLOSED TREE
testing/marionette/client/marionette_driver/marionette.py
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -658,34 +658,34 @@ class Marionette(object):
         """
         if timeout is None:
             timeout = self.DEFAULT_STARTUP_TIMEOUT
 
         runner = None
         if self.instance is not None:
             runner = self.instance.runner
 
-        poll_interval = 1
+        poll_interval = 0.1
         starttime = datetime.datetime.now()
 
         while datetime.datetime.now() - starttime < datetime.timedelta(seconds=timeout):
             # If the instance we want to connect to is not running return immediately
             if runner is not None and not runner.is_running():
                 return False
 
             sock = None
             try:
                 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 sock.settimeout(0.5)
                 sock.connect((self.host, self.port))
                 data = sock.recv(16)
                 if ":" in data:
                     return True
-            except socket.error as e:
-                print >>sys.stderr, "Connection attempt to Marionette failed ({})".format(e)
+            except socket.error:
+                pass
             finally:
                 if sock is not None:
                     sock.close()
 
             time.sleep(poll_interval)
 
         return False