diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py index 81bf39e..7346671 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py @@ -60,7 +60,7 @@ _DEFAULT_WSS_PORT = 9323 def url_is_alive(url): """Checks to see if we get an http response from |url|. - We poll the url 5 times with a 1 second delay. If we don't + We poll the url 20 times with a 0.5 second delay. If we don't get a reply in that time, we give up and assume the httpd didn't start properly. @@ -70,7 +70,7 @@ def url_is_alive(url): True if the url is alive. """ sleep_time = 0.5 - wait_time = 5 + wait_time = 10 while wait_time > 0: try: response = urllib.urlopen(url) |