Commit b99bba82 authored by Jason Madden's avatar Jason Madden

Increase some test server timeouts for appveyor.

parent ceec4406
...@@ -16,7 +16,7 @@ class Test(util.TestServer): ...@@ -16,7 +16,7 @@ class Test(util.TestServer):
kwargs = {'bufsize': 1} kwargs = {'bufsize': 1}
kwargs['mode'] = 'rb' kwargs['mode'] = 'rb'
conn = create_connection(('127.0.0.1', 16000)) conn = create_connection(('127.0.0.1', 16000))
conn.settimeout(0.1 if not greentest.RUNNING_ON_APPVEYOR else 1.0) conn.settimeout(0.1 if not greentest.RUNNING_ON_APPVEYOR else 2.0)
rfile = conn.makefile(**kwargs) rfile = conn.makefile(**kwargs)
welcome = rfile.readline() welcome = rfile.readline()
......
...@@ -7,6 +7,10 @@ from gevent.server import StreamServer ...@@ -7,6 +7,10 @@ from gevent.server import StreamServer
import errno import errno
import os import os
# Timeouts very flaky on appveyor
_DEFAULT_SOCKET_TIMEOUT = 0.1 if not greentest.RUNNING_ON_APPVEYOR else 1.0
_DEFAULT_TEST_TIMEOUT = 5 if not greentest.RUNNING_ON_APPVEYOR else 10
class SimpleStreamServer(StreamServer): class SimpleStreamServer(StreamServer):
...@@ -67,7 +71,7 @@ class Settings: ...@@ -67,7 +71,7 @@ class Settings:
class TestCase(greentest.TestCase): class TestCase(greentest.TestCase):
__timeout__ = 5 __timeout__ = _DEFAULT_TEST_TIMEOUT
def cleanup(self): def cleanup(self):
if getattr(self, 'server', None) is not None: if getattr(self, 'server', None) is not None:
...@@ -80,7 +84,7 @@ class TestCase(greentest.TestCase): ...@@ -80,7 +84,7 @@ class TestCase(greentest.TestCase):
sock.listen(5) sock.listen(5)
return sock return sock
def makefile(self, timeout=0.1, bufsize=1): def makefile(self, timeout=_DEFAULT_SOCKET_TIMEOUT, bufsize=1):
sock = socket.socket() sock = socket.socket()
try: try:
sock.connect((self.server.server_host, self.server.server_port)) sock.connect((self.server.server_host, self.server.server_port))
...@@ -103,7 +107,7 @@ class TestCase(greentest.TestCase): ...@@ -103,7 +107,7 @@ class TestCase(greentest.TestCase):
sock.close() sock.close()
return rconn return rconn
def send_request(self, url='/', timeout=0.1, bufsize=1): def send_request(self, url='/', timeout=_DEFAULT_SOCKET_TIMEOUT, bufsize=1):
conn = self.makefile(timeout=timeout, bufsize=bufsize) conn = self.makefile(timeout=timeout, bufsize=bufsize)
conn.write(('GET %s HTTP/1.0\r\n\r\n' % url).encode('latin-1')) conn.write(('GET %s HTTP/1.0\r\n\r\n' % url).encode('latin-1'))
conn.flush() conn.flush()
...@@ -149,7 +153,7 @@ class TestCase(greentest.TestCase): ...@@ -149,7 +153,7 @@ class TestCase(greentest.TestCase):
assert result.startswith('HTTP/1.0 500 Internal Server Error'), repr(result) assert result.startswith('HTTP/1.0 500 Internal Server Error'), repr(result)
conn.close() conn.close()
def assertRequestSucceeded(self, timeout=0.1): def assertRequestSucceeded(self, timeout=_DEFAULT_SOCKET_TIMEOUT):
conn = self.makefile(timeout=timeout) conn = self.makefile(timeout=timeout)
conn.write(b'GET /ping HTTP/1.0\r\n\r\n') conn.write(b'GET /ping HTTP/1.0\r\n\r\n')
result = conn.read() result = conn.read()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment