Commit 5098521a authored by Denis Bilenko's avatar Denis Bilenko

wsgi_test.py: fix test to pass on windows

parent c6ad8910
...@@ -32,13 +32,14 @@ import gevent ...@@ -32,13 +32,14 @@ import gevent
from gevent import socket from gevent import socket
CONTENT_LENGTH = 'Content-Length'
CONN_ABORTED_ERRORS = []
try: try:
from cStringIO import StringIO from errno import WSAECONNABORTED
CONN_ABORTED_ERRORS.append(WSAECONNABORTED)
except ImportError: except ImportError:
from StringIO import StringIO pass
CONTENT_LENGTH = 'Content-Length'
class ConnectionClosed(Exception): class ConnectionClosed(Exception):
...@@ -177,8 +178,12 @@ class TestHttpdBasic(TestCase): ...@@ -177,8 +178,12 @@ class TestHttpdBasic(TestCase):
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n') fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd) read_http(fd)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n') fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
self.assertRaises(ConnectionClosed, read_http, fd) try:
fd.close() result = fd.readline()
assert not result, 'The remote side is expected to close the connection, but it send %r' % (result, )
except socket.error, ex:
if ex[0] not in CONN_ABORTED_ERRORS:
raise
def skip_test_005_run_apachebench(self): def skip_test_005_run_apachebench(self):
url = 'http://localhost:%s/' % self.port url = 'http://localhost:%s/' % self.port
......
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