Skip to content

G
gevent
Commit 9ba08abb authored by Jason Madden's avatar Jason Madden
Browse files
Options

Locally clean runs of PyPy2.7 and CPython 2.7 

Took some tweaking of connection params --- did something change in OS X? And PyPy's GC has apparently changed the way it deals with sockets, we're better off being fully explicit about lifetime.
parent 8a172c2d
Hide whitespace changes
Inline Side-by-side
Showing with 477 additions and 351 deletions
CHANGES.rst
View file @ 9ba08abb
......@@ -22,6 +22,9 @@
- subprocess: ``WIFSTOPPED`` and ``SIGCHLD`` are now handled for
determining ``Popen.returncode``. See https://bugs.python.org/issue29335
- The result of ``gevent.ssl.SSLSocket.makefile()`` can be used as a
context manager on Python 2.
1.4.0 (2019-01-04)
==================
......
src/gevent/_socket2.py
View file @ 9ba08abb
......@@ -36,8 +36,9 @@ except AttributeError:
'gettimeout', 'shutdown')
else:
# Python 2 doesn't natively support with statements on _fileobject;
# but it eases our test cases if we can do the same with on both Py3
# and Py2. Implementation copied from Python 3
# but it substantially eases our test cases if we can do the same with on both Py3
# and Py2. (For this same reason we make the socket itself a context manager.)
# Implementation copied from Python 3
assert not hasattr(_fileobject, '__enter__')
# we could either patch in place:
#_fileobject.__enter__ = lambda self: self
......@@ -48,7 +49,7 @@ else:
# socket._fileobject (sigh), so we have to work around that.
# We also make it call our custom socket closing method that disposes
# if IO watchers but not the actual socket itself.
# of IO watchers but not the actual socket itself.
# Python 2 relies on reference counting to close sockets, so this is all
# very ugly and fragile.
......@@ -114,6 +115,9 @@ class socket(object):
This object should have the same API as the standard library socket linked to above. Not all
methods are specifically documented here; when they are they may point out a difference
to be aware of or may document a method the standard library does not.
.. versionchanged:: 1.5.0
This object is a context manager, returning itself, like in Python 3.
"""
# pylint:disable=too-many-public-methods
......@@ -142,6 +146,12 @@ class socket(object):
self._read_event = io(fileno, 1)
self._write_event = io(fileno, 2)
def __enter__(self):
return self
def __exit__(self, t, v, tb):
self.close()
def __repr__(self):
return '<%s at %s %s>' % (type(self).__name__, hex(id(self)), self._formatinfo())
......
src/gevent/_sslgte279.py
View file @ 9ba08abb
......@@ -35,6 +35,7 @@ __implements__ = [
'_create_unverified_context',
'_create_default_https_context',
'_create_stdlib_context',
'_fileobject',
]
# Import all symbols from Python's ssl.py, except those that we are implementing
......@@ -53,8 +54,21 @@ __all__ = __implements__ + __imports__
if 'namedtuple' in __all__:
__all__.remove('namedtuple')
orig_SSLContext = __ssl__.SSLContext # pylint: disable=no-member
# See notes in _socket2.py. Python 3 returns much nicer
# `io` object wrapped around a SocketIO class.
assert not hasattr(__ssl__._fileobject, '__enter__') # pylint:disable=used-before-assignment
class _fileobject(__ssl__._fileobject): # pylint:no-member
def __enter__(self):
return self
def __exit__(self, *args):
if not self.closed:
self.close()
orig_SSLContext = __ssl__.SSLContext # pylint: disable=no-member
class SSLContext(orig_SSLContext):
def wrap_socket(self, sock, server_side=False,
......
src/gevent/testing/params.py
View file @ 9ba08abb
......@@ -43,7 +43,7 @@ if PYPY and LIBUV:
# slow and flaky timeouts
LOCAL_TIMEOUT = CI_TIMEOUT
else:
LOCAL_TIMEOUT = 1
LOCAL_TIMEOUT = 2
LARGE_TIMEOUT = max(LOCAL_TIMEOUT, CI_TIMEOUT)
......@@ -51,12 +51,14 @@ DEFAULT_LOCAL_HOST_ADDR = 'localhost'
DEFAULT_LOCAL_HOST_ADDR6 = DEFAULT_LOCAL_HOST_ADDR
DEFAULT_BIND_ADDR = ''
if RUNNING_ON_TRAVIS:
if RUNNING_ON_TRAVIS or OSX:
# As of November 2017 (probably Sept or Oct), after a
# Travis upgrade, using "localhost" no longer works,
# producing 'OSError: [Errno 99] Cannot assign
# requested address'. This is apparently something to do with
# docker containers. Sigh.
# OSX 10.14.3 is also happier using explicit addresses
DEFAULT_LOCAL_HOST_ADDR = '127.0.0.1'
DEFAULT_LOCAL_HOST_ADDR6 = '::1'
# Likewise, binding to '' appears to work, but it cannot be
......
src/gevent/testing/patched_tests_setup.py
View file @ 9ba08abb
......@@ -224,6 +224,23 @@ if 'thread' in os.getenv('GEVENT_FILE', ''):
# Fails with "OSError: 9 invalid file descriptor"; expect GC/lifetime issues
]
if PY2 and PYPY:
disabled_tests += [
# These appear to hang or take a long time for some reason?
# Likely a hostname/binding issue or failure to properly close/gc sockets.
'test_httpservers.BaseHTTPServerTestCase.test_head_via_send_error',
'test_httpservers.BaseHTTPServerTestCase.test_head_keep_alive',
'test_httpservers.BaseHTTPServerTestCase.test_send_blank',
'test_httpservers.BaseHTTPServerTestCase.test_send_error',
'test_httpservers.CGIHTTPServerTestcase.test_post',
'test_httpservers.CGIHTTPServerTestCase.test_query_with_continuous_slashes',
'test_httpservers.CGIHTTPServerTestCase.test_query_with_multiple_question_mark',
'test_httpservers.CGIHTTPServerTestCase.test_os_environ_is_not_altered',
# This is flaxy, apparently a race condition? Began with PyPy 2.7-7
'test_asyncore.TestAPI_UsePoll.test_handle_error',
'test_asyncore.TestAPI_UsePoll.test_handle_read',
]
if LIBUV:
# epoll appears to work with these just fine in some cases;
......@@ -524,6 +541,11 @@ if PY2:
'test_ssl.ThreadedTests.test_alpn_protocols',
]
disabled_tests += [
# At least on OSX, this results in connection refused
'test_urllib2_localnet.TestUrlopen.test_https_sni',
]
def _make_run_with_original(mod_name, func_name):
@contextlib.contextmanager
def with_orig():
......@@ -809,6 +831,34 @@ if PYPY:
# This is an important test, so rather than skip it in patched_tests_setup,
# we do the gc before we return.
'test_urllib2_localnet.TestUrlopen.test_https_with_cafile': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_command': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_handler': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_head_keep_alive': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_head_via_send_error': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_header_close': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_internal_key_error': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_request_line_trimming': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_return_custom_status': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_return_header_keep_alive': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_send_blank': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_send_error': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_version_bogus': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_version_digits': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_version_invalid': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_version_none': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_version_none_get': _gc_at_end,
'test_httpservers.BaseHTTPServerTestCase.test_get': _gc_at_end,
'test_httpservers.SimpleHTTPServerTestCase.test_get': _gc_at_end,
'test_httpservers.SimpleHTTPServerTestCase.test_head': _gc_at_end,
'test_httpservers.SimpleHTTPServerTestCase.test_invalid_requests': _gc_at_end,
'test_httpservers.SimpleHTTPServerTestCase.test_path_without_leading_slash': _gc_at_end,
'test_httpservers.CGIHTTPServerTestCase.test_invaliduri': _gc_at_end,
'test_httpservers.CGIHTTPServerTestCase.test_issue19435': _gc_at_end,
# Unclear
'test_urllib2_localnet.ProxyAuthTests.test_proxy_with_bad_password_raises_httperror': _gc_at_end,
'test_urllib2_localnet.ProxyAuthTests.test_proxy_with_no_password_raises_httperror': _gc_at_end,
})
......
src/gevent/testing/testcase.py
View file @ 9ba08abb
......@@ -198,13 +198,17 @@ class TestCase(TestCaseMetaClass("NewBase",
super(TestCase, self).tearDown()
def _tearDownCloseOnTearDown(self):
# XXX: Should probably reverse this
for x in self.close_on_teardown:
close = getattr(x, 'close', x)
try:
close()
except Exception: # pylint:disable=broad-except
pass
while self.close_on_teardown:
to_close = reversed(self.close_on_teardown)
self.close_on_teardown = []
for x in to_close:
print("Closing", x)
close = getattr(x, 'close', x)
try:
close()
except Exception: # pylint:disable=broad-except
pass
@classmethod
def setUpClass(cls):
......
src/gevent/tests/test__pywsgi.py
View file @ 9ba08abb
......@@ -24,6 +24,7 @@ from gevent import monkey
monkey.patch_all(thread=False)
from contextlib import contextmanager
try:
from urllib.parse import parse_qs
except ImportError:
......@@ -40,7 +41,7 @@ try:
except ImportError:
from io import BytesIO as StringIO
import weakref
import unittest
from wsgiref.validate import validator
import gevent.testing as greentest
......@@ -205,11 +206,11 @@ class TestCase(greentest.TestCase):
# Bind to default address, which should give us ipv6 (when available)
# and ipv4. (see self.connect())
listen_addr = ''
listen_addr = greentest.DEFAULT_BIND_ADDR
# connect on ipv4, even though we bound to ipv6 too
# to prove ipv4 works...except on Windows, it apparently doesn't.
# So use the hostname.
connect_addr = 'localhost'
connect_addr = greentest.DEFAULT_LOCAL_HOST_ADDR
def init_logger(self):
import logging
......@@ -227,7 +228,10 @@ class TestCase(greentest.TestCase):
application = self.validator(application)
self.init_server(application)
self.server.start()
while not self.server.server_port:
print("Waiting on server port")
self.port = self.server.server_port
assert self.port
greentest.TestCase.setUp(self)
if greentest.CPYTHON and greentest.PY2:
......@@ -252,11 +256,15 @@ class TestCase(greentest.TestCase):
with gevent.Timeout.start_new(0.5):
self.server.stop()
self.server = None
if greentest.PYPY:
import gc
gc.collect()
gc.collect()
@contextmanager
def connect(self):
conn = socket.create_connection((self.connect_addr, self.port))
self._close_on_teardown(conn)
result = conn
if PY3:
conn_makefile = conn.makefile
......@@ -288,82 +296,92 @@ class TestCase(greentest.TestCase):
return makefile
return getattr(conn, name)
result = proxy()
return result
try:
yield result
finally:
result.close()
@contextmanager
def makefile(self):
return self.connect().makefile(bufsize=1)
with self.connect() as sock:
try:
result = sock.makefile(bufsize=1)
yield result
finally:
result.close()
def urlopen(self, *args, **kwargs):
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
return read_http(fd, *args, **kwargs)
with self.connect() as sock:
with sock.makefile(bufsize=1) as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
return read_http(fd, *args, **kwargs)
class CommonTests(TestCase):
def test_basic(self):
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd, body='hello world')
if response.headers.get('Connection') == 'close' and not server_implements_pipeline:
return
fd.write('GET /notexist HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, code=404, reason='Not Found', body='not found')
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, body='hello world')
fd.close()
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd, body='hello world')
if response.headers.get('Connection') == 'close' and not server_implements_pipeline:
return
fd.write('GET /notexist HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, code=404, reason='Not Found', body='not found')
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, body='hello world')
def test_pipeline(self):
if not server_implements_pipeline:
return
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n' + 'GET /notexist HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, body='hello world')
exception = AssertionError('HTTP pipelining not supported; the second request is thrown away')
try:
timeout = gevent.Timeout.start_new(0.5, exception=exception)
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n' + 'GET /notexist HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, body='hello world')
try:
read_http(fd, code=404, reason='Not Found', body='not found')
fd.close()
finally:
timeout.close()
except AssertionError as ex:
if ex is not exception:
raise
timeout = gevent.Timeout.start_new(0.5, exception=exception)
try:
read_http(fd, code=404, reason='Not Found', body='not found')
finally:
timeout.close()
except AssertionError as ex:
if ex is not exception:
raise
def test_connection_close(self):
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd)
if response.headers.get('Connection') == 'close' and not server_implements_pipeline:
return
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
# This may either raise, or it may return an empty response,
# depend on timing and the Python version.
try:
result = fd.readline()
except socket.error as ex:
if ex.args[0] not in CONN_ABORTED_ERRORS:
raise
else:
self.assertFalse(
result,
'The remote side is expected to close the connection, but it sent %r' % (result,))
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd)
if response.headers.get('Connection') == 'close' and not server_implements_pipeline:
return
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
# This may either raise, or it may return an empty response,
# depend on timing and the Python version.
try:
result = fd.readline()
except socket.error as ex:
if ex.args[0] not in CONN_ABORTED_ERRORS:
raise
else:
self.assertFalse(
result,
'The remote side is expected to close the connection, but it sent %r'
% (result,))
def SKIP_test_006_reject_long_urls(self):
fd = self.makefile()
@unittest.skip("Not sure")
def test_006_reject_long_urls(self):
path_parts = []
for _ in range(3000):
path_parts.append('path')
path = '/'.join(path_parts)
request = 'GET /%s HTTP/1.0\r\nHost: localhost\r\n\r\n' % path
fd.write(request)
result = fd.readline()
status = result.split(' ')[1]
self.assertEqual(status, '414')
fd.close()
with self.makefile() as fd:
request = 'GET /%s HTTP/1.0\r\nHost: localhost\r\n\r\n' % path
fd.write(request)
result = fd.readline()
status = result.split(' ')[1]
self.assertEqual(status, '414')
class TestNoChunks(CommonTests):
......@@ -381,19 +399,21 @@ class TestNoChunks(CommonTests):
return [b'not ', b'found']
def test(self):
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd, body='hello world')
self.assertFalse(response.chunks)
response.assertHeader('Content-Length', '11')
if not server_implements_pipeline:
fd = self.makefile()
raise unittest.SkipTest("No pipelines")
fd.write('GET /not-found HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd, code=404, reason='Not Found', body='not found')
self.assertFalse(response.chunks)
response.assertHeader('Content-Length', '9')
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd, body='hello world')
self.assertFalse(response.chunks)
response.assertHeader('Content-Length', '11')
fd.write('GET /not-found HTTP/1.1\r\nHost: localhost\r\n\r\n')
response = read_http(fd, code=404, reason='Not Found', body='not found')
self.assertFalse(response.chunks)
response.assertHeader('Content-Length', '9')
class TestExplicitContentLength(TestNoChunks): # pylint:disable=too-many-ancestors
......@@ -454,9 +474,9 @@ class MultiLineHeader(TestCase):
' type="text/xml";start="test.submit"',
'Content-Length: 0',
'', ''))
fd = self.makefile()
fd.write(request)
read_http(fd)
with self.makefile() as fd:
fd.write(request)
read_http(fd)
class TestGetArg(TestCase):
......@@ -472,19 +492,20 @@ class TestGetArg(TestCase):
def test_007_get_arg(self):
# define a new handler that does a get_arg as well as a read_body
fd = self.makefile()
request = '\r\n'.join((
'POST / HTTP/1.0',
'Host: localhost',
'Content-Length: 3',
'',
'a=a'))
fd.write(request)
with self.makefile() as fd:
fd.write(request)
# send some junk after the actual request
fd.write('01234567890123456789')
read_http(fd, body='a is a, body is a=a')
# send some junk after the actual request
fd.write('01234567890123456789')
read_http(fd, body='a is a, body is a=a')
fd.close()
class TestCloseIter(TestCase):
......@@ -506,9 +527,9 @@ class TestCloseIter(TestCase):
def test_close_is_called(self):
self.closed = False
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, body=b"Hello World!", chunks=[b'Hello World', b'!'])
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd, body=b"Hello World!", chunks=[b'Hello World', b'!'])
# We got closed exactly once.
self.assertEqual(self.closed, 1)
......@@ -526,9 +547,9 @@ class TestChunkedApp(TestCase):
yield chunk
def test_chunked_response(self):
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body(), chunks=None)
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body(), chunks=None)
if server_implements_chunked:
response.assertHeader('Transfer-Encoding', 'chunked')
self.assertEqual(response.chunks, self.chunks)
......@@ -538,9 +559,9 @@ class TestChunkedApp(TestCase):
self.assertEqual(response.chunks, False)
def test_no_chunked_http_1_0(self):
fd = self.makefile()
fd.write('GET / HTTP/1.0\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd)
with self.makefile() as fd:
fd.write('GET / HTTP/1.0\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd)
self.assertEqual(response.body, self.body())
self.assertEqual(response.headers.get('Transfer-Encoding'), None)
content_length = response.headers.get('Content-Length')
......@@ -562,20 +583,20 @@ class TestNegativeRead(TestCase):
return [data]
def test_negative_chunked_read(self):
fd = self.makefile()
data = (b'POST /read HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'2\r\noh\r\n4\r\n hai\r\n0\r\n\r\n')
fd.write(data)
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data)
read_http(fd, body='oh hai')
def test_negative_nonchunked_read(self):
fd = self.makefile()
data = (b'POST /read HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Content-Length: 6\r\n\r\n'
b'oh hai')
fd.write(data)
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data)
read_http(fd, body='oh hai')
class TestNegativeReadline(TestCase):
......@@ -589,25 +610,24 @@ class TestNegativeReadline(TestCase):
return [data]
def test_negative_chunked_readline(self):
fd = self.makefile()
data = (b'POST /readline HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'2\r\noh\r\n4\r\n hai\r\n0\r\n\r\n')
fd.write(data)
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data)
read_http(fd, body='oh hai')
def test_negative_nonchunked_readline(self):
fd = self.makefile()
data = (b'POST /readline HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Content-Length: 6\r\n\r\n'
b'oh hai')
fd.write(data)
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data)
read_http(fd, body='oh hai')
class TestChunkedPost(TestCase):
def application(self, env, start_response):
self.assertTrue(env.get('wsgi.input_terminated'))
start_response('200 OK', [('Content-Type', 'text/plain')])
......@@ -623,21 +643,21 @@ class TestChunkedPost(TestCase):
return [x for x in iter(lambda: env['wsgi.input'].read(1), b'')]
def test_014_chunked_post(self):
fd = self.makefile()
data = (b'POST /a HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'2\r\noh\r\n4\r\n hai\r\n0\r\n\r\n')
fd.write(data)
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data)
read_http(fd, body='oh hai')
# self.close_opened() # XXX: Why?
fd = self.makefile()
fd.write(data.replace(b'/a', b'/b'))
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data.replace(b'/a', b'/b'))
read_http(fd, body='oh hai')
fd = self.makefile()
fd.write(data.replace(b'/a', b'/c'))
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data.replace(b'/a', b'/c'))
read_http(fd, body='oh hai')
def test_229_incorrect_chunk_no_newline(self):
# Giving both a Content-Length and a Transfer-Encoding,
......@@ -648,9 +668,9 @@ class TestChunkedPost(TestCase):
b'Content-Length: 12\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'{"hi": "ho"}')
fd = self.makefile()
fd.write(data)
read_http(fd, code=400)
with self.makefile() as fd:
fd.write(data)
read_http(fd, code=400)
def test_229_incorrect_chunk_non_hex(self):
# Giving both a Content-Length and a Transfer-Encoding,
......@@ -660,34 +680,34 @@ class TestChunkedPost(TestCase):
b'Content-Length: 12\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'{"hi": "ho"}\r\n')
fd = self.makefile()
fd.write(data)
read_http(fd, code=400)
with self.makefile() as fd:
fd.write(data)
read_http(fd, code=400)
def test_229_correct_chunk_quoted_ext(self):
data = (b'POST /a HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'2;token="oh hi"\r\noh\r\n4\r\n hai\r\n0\r\n\r\n')
fd = self.makefile()
fd.write(data)
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data)
read_http(fd, body='oh hai')
def test_229_correct_chunk_token_ext(self):
data = (b'POST /a HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'2;token=oh_hi\r\noh\r\n4\r\n hai\r\n0\r\n\r\n')
fd = self.makefile()
fd.write(data)
read_http(fd, body='oh hai')
with self.makefile() as fd:
fd.write(data)
read_http(fd, body='oh hai')
def test_229_incorrect_chunk_token_ext_too_long(self):
data = (b'POST /a HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
b'Transfer-Encoding: chunked\r\n\r\n'
b'2;token=oh_hi\r\noh\r\n4\r\n hai\r\n0\r\n\r\n')
data = data.replace(b'oh_hi', b'_oh_hi' * 4000)
fd = self.makefile()
fd.write(data)
read_http(fd, code=400)
with self.makefile() as fd:
fd.write(data)
read_http(fd, code=400)
class TestUseWrite(TestCase):
......@@ -713,16 +733,16 @@ class TestUseWrite(TestCase):
return [self.end]
def test_explicit_content_length(self):
fd = self.makefile()
fd.write('GET /explicit-content-length HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body + self.end)
with self.makefile() as fd:
fd.write('GET /explicit-content-length HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body + self.end)
response.assertHeader('Content-Length', self.content_length)
response.assertHeader('Transfer-Encoding', False)
def test_no_content_length(self):
fd = self.makefile()
fd.write('GET /no-content-length HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body + self.end)
with self.makefile() as fd:
fd.write('GET /no-content-length HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body + self.end)
if server_implements_chunked:
response.assertHeader('Content-Length', False)
response.assertHeader('Transfer-Encoding', 'chunked')
......@@ -730,13 +750,13 @@ class TestUseWrite(TestCase):
response.assertHeader('Content-Length', self.content_length)
def test_no_content_length_twice(self):
fd = self.makefile()
fd.write('GET /no-content-length-twice HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body + self.body + self.end)
with self.makefile() as fd:
fd.write('GET /no-content-length-twice HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
response = read_http(fd, body=self.body + self.body + self.end)
if server_implements_chunked:
response.assertHeader('Content-Length', False)
response.assertHeader('Transfer-Encoding', 'chunked')
assert response.chunks == [self.body, self.body, self.end], response.chunks
self.assertEqual(response.chunks, [self.body, self.body, self.end])
else:
response.assertHeader('Content-Length', str(5 + 5 + 3))
......@@ -752,24 +772,20 @@ class HttpsTestCase(TestCase):
def urlopen(self, method='GET', post_body=None, **kwargs): # pylint:disable=arguments-differ
import ssl
raw_sock = self.connect()
sock = ssl.wrap_socket(raw_sock)
fd = sock.makefile(bufsize=1) # pylint:disable=unexpected-keyword-arg
fd.write('%s / HTTP/1.1\r\nHost: localhost\r\n' % method)
if post_body is not None:
fd.write('Content-Length: %s\r\n\r\n' % len(post_body))
fd.write(post_body)
if kwargs.get('body') is None:
kwargs['body'] = post_body
else:
fd.write('\r\n')
fd.flush()
try:
return read_http(fd, **kwargs)
finally:
fd.close()
sock.close()
raw_sock.close()
with self.connect() as raw_sock:
with ssl.wrap_socket(raw_sock) as sock:
with sock.makefile(bufsize=1) as fd: # pylint:disable=unexpected-keyword-arg
fd.write('%s / HTTP/1.1\r\nHost: localhost\r\n' % method)
if post_body is not None:
fd.write('Content-Length: %s\r\n\r\n' % len(post_body))
fd.write(post_body)
if kwargs.get('body') is None:
kwargs['body'] = post_body
else:
fd.write('\r\n')
fd.flush()
return read_http(fd, **kwargs)
def application(self, environ, start_response):
assert environ['wsgi.url_scheme'] == 'https', environ['wsgi.url_scheme']
......@@ -827,13 +843,15 @@ class TestInternational(TestCase):
return []
def test(self):
sock = self.connect()
sock.sendall(b'''GET /%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82?%D0%B2%D0%BE%D0%BF%D1%80%D0%BE%D1%81=%D0%BE%D1%82%D0%B2%D0%B5%D1%82 HTTP/1.1
with self.connect() as sock:
sock.sendall(
b'''GET /%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82?%D0%B2%D0%BE%D0%BF%D1%80%D0%BE%D1%81=%D0%BE%D1%82%D0%B2%D0%B5%D1%82 HTTP/1.1
Host: localhost
Connection: close
'''.replace(b'\n', b'\r\n'))
read_http(sock.makefile(), reason='PASSED', chunks=False, body='', content_length=0)
with sock.makefile() as fd:
read_http(fd, reason='PASSED', chunks=False, body='', content_length=0)
class TestNonLatin1HeaderFromApplication(TestCase):
......@@ -863,18 +881,19 @@ class TestNonLatin1HeaderFromApplication(TestCase):
return []
def test(self):
sock = self.connect()
self.expect_one_error()
sock.sendall(b'''GET / HTTP/1.1\r\n\r\n''')
if self.should_error:
read_http(sock.makefile(), code=500, reason='Internal Server Error')
self.assert_error(where_type=pywsgi.SecureEnviron)
self.assertEqual(len(self.errors), 1)
_, v = self.errors[0]
self.assertIsInstance(v, UnicodeError)
else:
read_http(sock.makefile(), code=200, reason='PASSED')
self.assertEqual(len(self.errors), 0)
with self.connect() as sock:
self.expect_one_error()
sock.sendall(b'''GET / HTTP/1.1\r\n\r\n''')
with sock.makefile() as fd:
if self.should_error:
read_http(fd, code=500, reason='Internal Server Error')
self.assert_error(where_type=pywsgi.SecureEnviron)
self.assertEqual(len(self.errors), 1)
_, v = self.errors[0]
self.assertIsInstance(v, UnicodeError)
else:
read_http(fd, code=200, reason='PASSED')
self.assertEqual(len(self.errors), 0)
class TestNonLatin1UnicodeHeaderFromApplication(TestNonLatin1HeaderFromApplication):
......@@ -905,12 +924,12 @@ class TestInputReadline(TestCase):
return [l.encode('ascii') for l in lines] if PY3 else lines
def test(self):
fd = self.makefile()
content = 'hello\n\nworld\n123'
fd.write('POST / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
'Content-Length: %s\r\n\r\n%s' % (len(content), content))
fd.flush()
read_http(fd, reason='hello', body="'hello\\n' '\\n' 'world\\n' '123' ")
with self.makefile() as fd:
content = 'hello\n\nworld\n123'
fd.write('POST / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n'
'Content-Length: %s\r\n\r\n%s' % (len(content), content))
fd.flush()
read_http(fd, reason='hello', body="'hello\\n' '\\n' 'world\\n' '123' ")
class TestInputIter(TestInputReadline):
......@@ -986,17 +1005,17 @@ class TestEmptyYield(TestCase):
yield b""
def test_err(self):
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
if server_implements_chunked:
chunks = []
else:
chunks = False
read_http(fd, body='', chunks=chunks)
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd, body='', chunks=chunks)
garbage = fd.read()
garbage = fd.read()
self.assertEqual(garbage, b"", "got garbage: %r" % garbage)
......@@ -1009,18 +1028,18 @@ class TestFirstEmptyYield(TestCase):
yield b"hello"
def test_err(self):
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
if server_implements_chunked:
chunks = [b'hello']
else:
chunks = False
read_http(fd, body='hello', chunks=chunks)
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd, body='hello', chunks=chunks)
garbage = fd.read()
self.assertTrue(garbage == b"", "got garbage: %r" % garbage)
garbage = fd.read()
self.assertEqual(garbage, b"")
class TestEmptyYield304(TestCase):
......@@ -1032,11 +1051,11 @@ class TestEmptyYield304(TestCase):
yield b""
def test_err(self):
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd, code=304, body='', chunks=False)
garbage = fd.read()
self.assertEqual(garbage, b"", "got garbage: %r" % garbage)
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd, code=304, body='', chunks=False)
garbage = fd.read()
self.assertEqual(garbage, b"")
class TestContentLength304(TestCase):
......@@ -1052,12 +1071,13 @@ class TestContentLength304(TestCase):
raise AssertionError('start_response did not fail but it should')
def test_err(self):
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
body = "Invalid Content-Length for 304 response: '100' (must be absent or zero)"
read_http(fd, code=200, reason='Raised', body=body, chunks=False)
garbage = fd.read()
self.assertEqual(garbage, b"", "got garbage: %r" % garbage)
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
read_http(fd, code=200, reason='Raised', body=body, chunks=False)
garbage = fd.read()
self.assertEqual(garbage, b"")
class TestBody304(TestCase):
......@@ -1068,14 +1088,14 @@ class TestBody304(TestCase):
return [b'body']
def test_err(self):
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
try:
read_http(fd)
except AssertionError as ex:
self.assertEqual(str(ex), 'The 304 response must have no body')
else:
raise AssertionError('AssertionError must be raised')
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
try:
read_http(fd)
except AssertionError as ex:
self.assertEqual(str(ex), 'The 304 response must have no body')
else:
raise AssertionError('AssertionError must be raised')
class TestWrite304(TestCase):
......@@ -1092,11 +1112,12 @@ class TestWrite304(TestCase):
raise
def test_err(self):
fd = self.connect().makefile(bufsize=1)
fd.write(b'GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
with self.assertRaises(AssertionError) as exc:
read_http(fd)
ex = exc.exception
with self.makefile() as fd:
fd.write(b'GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
with self.assertRaises(AssertionError) as exc:
read_http(fd)
ex = exc.exception
self.assertEqual(str(ex), 'The 304 response must have no body')
self.assertTrue(self.error_raised, 'write() must raise')
......@@ -1123,15 +1144,15 @@ class BadRequestTests(TestCase):
def test_negative_content_length(self):
self.content_length = '-100'
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nContent-Length: %s\r\n\r\n' % self.content_length)
read_http(fd, code=(200, 400))
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nContent-Length: %s\r\n\r\n' % self.content_length)
read_http(fd, code=(200, 400))
def test_illegal_content_length(self):
self.content_length = 'abc'
fd = self.connect().makefile(bufsize=1)
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nContent-Length: %s\r\n\r\n' % self.content_length)
read_http(fd, code=(200, 400))
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nContent-Length: %s\r\n\r\n' % self.content_length)
read_http(fd, code=(200, 400))
class ChunkedInputTests(TestCase):
......@@ -1178,58 +1199,56 @@ class ChunkedInputTests(TestCase):
except ConnectionClosed:
if server_implements_pipeline:
raise
fd = self.connect().makefile(bufsize=1)
self.ping(fd)
with self.makefile() as fd2:
self.ping(fd2)
def test_short_read_with_content_length(self):
body = self.body()
req = b"POST /short-read HTTP/1.1\r\ntransfer-encoding: Chunked\r\nContent-Length:1000\r\n\r\n" + body
conn = self.connect()
fd = conn.makefile(bufsize=1)
fd.write(req)
read_http(fd, body="this is ch")
with self.connect() as conn:
with conn.makefile(bufsize=1) as fd: # pylint:disable=unexpected-keyword-arg
fd.write(req)
read_http(fd, body="this is ch")
self.ping_if_possible(fd)
fd.close()
conn.close()
self.ping_if_possible(fd)
def test_short_read_with_zero_content_length(self):
body = self.body()
req = b"POST /short-read HTTP/1.1\r\ntransfer-encoding: Chunked\r\nContent-Length:0\r\n\r\n" + body
#print("REQUEST:", repr(req))
fd = self.connect().makefile(bufsize=1)
fd.write(req)
read_http(fd, body="this is ch")
with self.makefile() as fd:
fd.write(req)
read_http(fd, body="this is ch")
self.ping_if_possible(fd)
self.ping_if_possible(fd)
def test_short_read(self):
body = self.body()
req = b"POST /short-read HTTP/1.1\r\ntransfer-encoding: Chunked\r\n\r\n" + body
fd = self.connect().makefile(bufsize=1)
fd.write(req)
read_http(fd, body="this is ch")
with self.makefile() as fd:
fd.write(req)
read_http(fd, body="this is ch")
self.ping_if_possible(fd)
self.ping_if_possible(fd)
def test_dirt(self):
body = self.body(dirt="; here is dirt\0bla")
req = b"POST /ping HTTP/1.1\r\ntransfer-encoding: Chunked\r\n\r\n" + body
fd = self.connect().makefile(bufsize=1)
fd.write(req)
try:
read_http(fd, body="pong")
except AssertionError as ex:
if str(ex).startswith('Unexpected code: 400'):
if not server_implements_chunked:
print('ChunkedNotImplementedWarning')
return
raise
with self.makefile() as fd:
fd.write(req)
try:
read_http(fd, body="pong")
except AssertionError as ex:
if str(ex).startswith('Unexpected code: 400'):
if not server_implements_chunked:
print('ChunkedNotImplementedWarning')
return
raise
self.ping_if_possible(fd)
self.ping_if_possible(fd)
def test_chunked_readline(self):
body = self.body()
......@@ -1237,18 +1256,18 @@ class ChunkedInputTests(TestCase):
req = req.encode('latin-1')
req += body
fd = self.connect().makefile(bufsize=1)
fd.write(req)
read_http(fd, body='this is chunked\nline 2\nline3')
with self.makefile() as fd:
fd.write(req)
read_http(fd, body='this is chunked\nline 2\nline3')
def test_close_before_finished(self):
self.expect_one_error()
body = b'4\r\nthi'
req = b"POST /short-read HTTP/1.1\r\ntransfer-encoding: Chunked\r\n\r\n" + body
sock = self.connect()
fd = sock.makefile(bufsize=1, mode='wb')
fd.write(req)
fd.close()
with self.connect() as sock:
with sock.makefile(bufsize=1, mode='wb') as fd:# pylint:disable=unexpected-keyword-arg
fd.write(req)
fd.close()
# Python 3 keeps the socket open even though the only
# makefile is gone; python 2 closed them both (because there were
......@@ -1304,21 +1323,21 @@ class Expect100ContinueTests(TestCase):
return [text]
def test_continue(self):
fd = self.connect().makefile(bufsize=1)
with self.makefile() as fd:
fd.write('PUT / HTTP/1.1\r\nHost: localhost\r\nContent-length: 1025\r\nExpect: 100-continue\r\n\r\n')
try:
read_http(fd, code=417, body="failure")
except AssertionError as ex:
if str(ex).startswith('Unexpected code: 400'):
if not server_implements_100continue:
print('100ContinueNotImplementedWarning')
return
raise
fd.write('PUT / HTTP/1.1\r\nHost: localhost\r\nContent-length: 1025\r\nExpect: 100-continue\r\n\r\n')
try:
read_http(fd, code=417, body="failure")
except AssertionError as ex:
if str(ex).startswith('Unexpected code: 400'):
if not server_implements_100continue:
print('100ContinueNotImplementedWarning')
return
raise
fd.write('PUT / HTTP/1.1\r\nHost: localhost\r\nContent-length: 7\r\nExpect: 100-continue\r\n\r\ntesting')
read_http(fd, code=100)
read_http(fd, body="testing")
fd.write('PUT / HTTP/1.1\r\nHost: localhost\r\nContent-length: 7\r\nExpect: 100-continue\r\n\r\ntesting')
read_http(fd, code=100)
read_http(fd, body="testing")
class MultipleCookieHeadersTest(TestCase):
......@@ -1332,14 +1351,14 @@ class MultipleCookieHeadersTest(TestCase):
return []
def test(self):
fd = self.connect().makefile(bufsize=1)
fd.write('''GET / HTTP/1.1
with self.makefile() as fd:
fd.write('''GET / HTTP/1.1
Host: localhost
Cookie: name1="value1"
Cookie2: nameA="valueA"
Cookie2: nameB="valueB"
Cookie: name2="value2"\n\n'''.replace('\n', '\r\n'))
read_http(fd)
read_http(fd)
class TestLeakInput(TestCase):
......@@ -1364,15 +1383,15 @@ class TestLeakInput(TestCase):
return [text]
def test_connection_close_leak_simple(self):
fd = self.connect().makefile(bufsize=1)
fd.write(b"GET / HTTP/1.0\r\nConnection: close\r\n\r\n")
d = fd.read()
with self.makefile() as fd:
fd.write(b"GET / HTTP/1.0\r\nConnection: close\r\n\r\n")
d = fd.read()
self.assertTrue(d.startswith(b"HTTP/1.1 200 OK"), d)
def test_connection_close_leak_frame(self):
fd = self.connect().makefile(bufsize=1)
fd.write(b"GET /leak-frame HTTP/1.0\r\nConnection: close\r\n\r\n")
d = fd.read()
with self.makefile() as fd:
fd.write(b"GET /leak-frame HTTP/1.0\r\nConnection: close\r\n\r\n")
d = fd.read()
self.assertTrue(d.startswith(b"HTTP/1.1 200 OK"), d)
self._leak_environ.pop('_leak')
......@@ -1405,9 +1424,9 @@ class TestHTTPResponseSplitting(TestCase):
return ()
def _assert_failure(self, message):
fd = self.makefile()
fd.write('GET / HTTP/1.0\r\nHost: localhost\r\n\r\n')
fd.read()
with self.makefile() as fd:
fd.write('GET / HTTP/1.0\r\nHost: localhost\r\n\r\n')
fd.read()
self.assertIsInstance(self.start_exc, ValueError)
self.assertEqual(self.start_exc.args[0], message)
......@@ -1437,12 +1456,12 @@ class TestInvalidEnviron(TestCase):
return []
def test(self):
fd = self.makefile()
fd.write('GET / HTTP/1.0\r\nHost: localhost\r\n\r\n')
read_http(fd)
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd)
with self.makefile() as fd:
fd.write('GET / HTTP/1.0\r\nHost: localhost\r\n\r\n')
read_http(fd)
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n')
read_http(fd)
class TestInvalidHeadersDropped(TestCase):
......@@ -1455,9 +1474,9 @@ class TestInvalidHeadersDropped(TestCase):
return []
def test(self):
fd = self.makefile()
fd.write('GET / HTTP/1.0\r\nx-auth_user: bob\r\n\r\n')
read_http(fd)
with self.makefile() as fd:
fd.write('GET / HTTP/1.0\r\nx-auth_user: bob\r\n\r\n')
read_http(fd)
class Handler(pywsgi.WSGIHandler):
......@@ -1492,21 +1511,21 @@ class TestHandlerSubclass(TestCase):
handler_class=Handler)
def test(self):
fd = self.makefile()
fd.write(b'<policy-file-request/>\x00')
fd.flush() # flush() is needed on PyPy, apparently it buffers slightly differently
self.assertEqual(fd.read(), b'HELLO')
fd = self.makefile()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
fd.flush()
read_http(fd)
with self.makefile() as fd:
fd.write(b'<policy-file-request/>\x00')
fd.flush() # flush() is needed on PyPy, apparently it buffers slightly differently
self.assertEqual(fd.read(), b'HELLO')
with self.makefile() as fd:
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n')
fd.flush()
read_http(fd)
fd = self.makefile()
# Trigger an error
fd.write('<policy-file-XXXuest/>\x00')
fd.flush()
self.assertEqual(fd.read(), b'')
with self.makefile() as fd:
# Trigger an error
fd.write('<policy-file-XXXuest/>\x00')
fd.flush()
self.assertEqual(fd.read(), b'')
class TestErrorAfterChunk(TestCase):
......@@ -1519,10 +1538,11 @@ class TestErrorAfterChunk(TestCase):
raise greentest.ExpectedException('TestErrorAfterChunk')
def test(self):
fd = self.connect().makefile(bufsize=1)
self.expect_one_error()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: keep-alive\r\n\r\n')
self.assertRaises(ValueError, read_http, fd)
with self.makefile() as fd:
self.expect_one_error()
fd.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: keep-alive\r\n\r\n')
with self.assertRaises(ValueError):
read_http(fd)
self.assert_error(greentest.ExpectedException)
......@@ -1649,10 +1669,10 @@ class Test414(TestCase):
raise AssertionError('should not get there')
def test(self):
fd = self.makefile()
longline = 'x' * 20000
fd.write(('''GET /%s HTTP/1.0\r\nHello: world\r\n\r\n''' % longline).encode('latin-1'))
read_http(fd, code=414)
with self.makefile() as fd:
fd.write(('''GET /%s HTTP/1.0\r\nHello: world\r\n\r\n''' % longline).encode('latin-1'))
read_http(fd, code=414)
class TestLogging(TestCase):
......
src/gevent/tests/test__server.py
View file @ 9ba08abb
......@@ -109,26 +109,35 @@ class TestCase(greentest.TestCase):
def makefile(self, timeout=_DEFAULT_SOCKET_TIMEOUT, bufsize=1):
server_host, server_port, family = self.get_server_host_port_family()
bufarg = 'buffering' if PY3 else 'bufsize'
makefile_kwargs = {bufarg: bufsize}
if PY3:
# Under Python3, you can't read and write to the same
# makefile() opened in r, and r+ is not allowed
makefile_kwargs['mode'] = 'rwb'
sock = socket.socket(family=family)
self._close_on_teardown(sock)
rconn = None
try:
#print("Connecting to", self.server, self.server.started, server_host, server_port)
sock.connect((server_host, server_port))
rconn = sock.makefile(**makefile_kwargs)
self._close_on_teardown(rconn)
if PY3: # XXX: Why do we do this?
self._close_on_teardown(rconn._sock)
rconn._sock = sock
rconn._sock.settimeout(timeout)
except Exception:
# avoid ResourceWarning under Py3
#print("Failed to connect to", self.server)
# avoid ResourceWarning under Py3/PyPy
sock.close()
if rconn is not None:
rconn.close()
del rconn
del sock
raise
if PY3:
# Under Python3, you can't read and write to the same
# makefile() opened in r, and r+ is not allowed
kwargs = {'buffering': bufsize, 'mode': 'rwb'}
else:
kwargs = {'bufsize': bufsize}
rconn = sock.makefile(**kwargs)
if PY3:
rconn._sock = sock
rconn._sock.settimeout(timeout)
sock.close()
return rconn
......@@ -172,15 +181,19 @@ class TestCase(greentest.TestCase):
except socket.timeout:
self.assertFalse(result)
return
finally:
conn.close()
self.assertTrue(result.startswith(b'HTTP/1.0 500 Internal Server Error'), repr(result))
conn.close()
def assertRequestSucceeded(self, timeout=_DEFAULT_SOCKET_TIMEOUT):
conn = self.makefile(timeout=timeout)
conn.write(b'GET /ping HTTP/1.0\r\n\r\n')
result = conn.read()
conn.close()
assert result.endswith(b'\r\n\r\nPONG'), repr(result)
try:
conn.write(b'GET /ping HTTP/1.0\r\n\r\n')
result = conn.read()
finally:
conn.close()
self.assertTrue(result.endswith(b'\r\n\r\nPONG'), repr(result))
def start_server(self):
self.server.start()
......@@ -293,24 +306,25 @@ class TestDefaultSpawn(TestCase):
gevent.sleep(0.01)
self.assertRequestSucceeded()
self.server.stop()
assert not self.server.started
self.assertFalse(self.server.started)
self.assertConnectionRefused()
finally:
g.kill()
g.get()
self.server.stop()
def test_serve_forever(self):
self.server = self.ServerSubClass(('127.0.0.1', 0))
assert not self.server.started
self.assertFalse(self.server.started)
self.assertConnectionRefused()
self._test_serve_forever()
def test_serve_forever_after_start(self):
self.server = self.ServerSubClass((greentest.DEFAULT_BIND_ADDR, 0))
self.assertConnectionRefused()
assert not self.server.started
self.assertFalse(self.server.started)
self.server.start()
assert self.server.started
self.assertTrue(self.server.started)
self._test_serve_forever()
def test_server_closes_client_sockets(self):
......
src/gevent/tests/test__server_pywsgi.py
View file @ 9ba08abb
......@@ -52,19 +52,25 @@ class Settings(test__server.Settings):
@staticmethod
def assert500(inst):
conn = inst.makefile()
conn.write(b'GET / HTTP/1.0\r\n\r\n')
result = conn.read()
inst.assertTrue(result.startswith(internal_error_start),
(result, internal_error_start))
inst.assertTrue(result.endswith(internal_error_end),
(result, internal_error_end))
try:
conn.write(b'GET / HTTP/1.0\r\n\r\n')
result = conn.read()
inst.assertTrue(result.startswith(internal_error_start),
(result, internal_error_start))
inst.assertTrue(result.endswith(internal_error_end),
(result, internal_error_end))
finally:
conn.close()
@staticmethod
def assert503(inst):
conn = inst.makefile()
conn.write(b'GET / HTTP/1.0\r\n\r\n')
result = conn.read()
inst.assertEqual(result, internal_error503)
try:
conn.write(b'GET / HTTP/1.0\r\n\r\n')
result = conn.read()
inst.assertEqual(result, internal_error503)
finally:
conn.close()
@staticmethod
def assertPoolFull(inst):
......@@ -74,8 +80,11 @@ class Settings(test__server.Settings):
@staticmethod
def assertAcceptedConnectionError(inst):
conn = inst.makefile()
result = conn.read()
inst.assertFalse(result)
try:
result = conn.read()
inst.assertFalse(result)
finally:
conn.close()
@staticmethod
def fill_default_server_args(inst, kwargs):
......
src/greentest/2.7pypy/test_httpservers.py
View file @ 9ba08abb
......@@ -671,7 +671,7 @@ def test_main(verbose=None):
MySimpleHTTPRequestHandlerTestCase = SimpleHTTPRequestHandlerTestCase
MySimpleHTTPServerTestCase = SimpleHTTPServerTestCase
MyCGIHTTPServerTestCase = CGIHTTPServerTestCase
if greentest.PYPY and greentest.WIN:
if greentest.PYPY:
class MySimpleHTTPRequestHandlerTestCase(unittest.TestCase):
def setUp(self):
raise unittest.SkipTest("gevent: Hangs")
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7