Skip to content

Commit

Permalink
Drop unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov committed Aug 5, 2016
1 parent 96854d1 commit 3f8595b
Showing 1 changed file with 12 additions and 36 deletions.
48 changes: 12 additions & 36 deletions aiohttp/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,9 @@ def run_server(loop, *, listen_addr=('127.0.0.1', 0),
class HttpRequestHandler:

def __init__(self, addr):
if isinstance(addr, tuple):
host, port = addr
self.host = host
self.port = port
else:
self.host = host = 'localhost'
self.port = port = 0
host, port = addr
self.host = host
self.port = port
self.address = addr
self._url = '{}://{}:{}'.format(
'https' if use_ssl else 'http', host, port)
Expand Down Expand Up @@ -84,22 +80,11 @@ def handle_request(self, message, payload):
self.transport.write(b'HTTP/1.0 100 Continue\r\n\r\n')
break

if router is not None:
body = yield from payload.read()
body = yield from payload.read()

rob = router(
self, properties, self.transport, message, body)
rob.dispatch()

else:
response = aiohttp.Response(self.writer, 200, message.version)

text = b'Test message'
response.add_header('Content-type', 'text/plain')
response.add_header('Content-length', str(len(text)))
response.send_headers()
response.write(text)
response.write_eof()
rob = router(
self, properties, self.transport, message, body)
rob.dispatch()

if use_ssl:
here = os.path.join(os.path.dirname(__file__), '..', 'tests')
Expand All @@ -114,19 +99,10 @@ def run(loop, fut):
thread_loop = asyncio.new_event_loop()
asyncio.set_event_loop(thread_loop)

if isinstance(listen_addr, tuple):
host, port = listen_addr
server_coroutine = thread_loop.create_server(
lambda: TestHttpServer(keep_alive=0.5),
host, port, ssl=sslcontext)
else:
try:
os.unlink(listen_addr)
except FileNotFoundError:
pass
server_coroutine = thread_loop.create_unix_server(
lambda: TestHttpServer(keep_alive=0.5, timeout=15),
listen_addr, ssl=sslcontext)
host, port = listen_addr
server_coroutine = thread_loop.create_server(
lambda: TestHttpServer(keep_alive=0.5),
host, port, ssl=sslcontext)
server = thread_loop.run_until_complete(server_coroutine)

waiter = helpers.create_future(thread_loop)
Expand Down Expand Up @@ -470,7 +446,7 @@ def get_app(self, loop):
:param loop: the event_loop to use
:type loop: asyncio.BaseEventLoop
"""
pass
pass # pragma: no cover

def setUp(self):
self.loop = setup_test_loop()
Expand Down

0 comments on commit 3f8595b

Please sign in to comment.