|
 |
ae8baa |
From eb4f5a4bb28f8260d4edc32969e838d9abace051 Mon Sep 17 00:00:00 2001
|
|
|
ae8baa |
From: Andrew Svetlov <andrew.svetlov@gmail.com>
|
|
|
ae8baa |
Date: Mon, 15 Oct 2018 21:32:48 +0300
|
|
|
ae8baa |
Subject: [PATCH] Fix tests
|
|
|
ae8baa |
|
|
|
ae8baa |
---
|
|
|
ae8baa |
tests/integration/test_real_browser.py | 18 ++++++++----------
|
|
|
ae8baa |
tests/unit/test_cors_config.py | 5 ++---
|
|
|
ae8baa |
2 files changed, 10 insertions(+), 13 deletions(-)
|
|
|
ae8baa |
|
|
|
ae8baa |
diff --git a/tests/integration/test_real_browser.py b/tests/integration/test_real_browser.py
|
|
|
ae8baa |
index a5c9030..5dff79a 100644
|
|
|
ae8baa |
--- a/tests/integration/test_real_browser.py
|
|
|
ae8baa |
+++ b/tests/integration/test_real_browser.py
|
|
|
ae8baa |
@@ -193,22 +193,20 @@ class ResourceView(web.View, CorsViewMixin):
|
|
|
ae8baa |
|
|
|
ae8baa |
# Start servers.
|
|
|
ae8baa |
for server_name, server_descr in self.servers.items():
|
|
|
ae8baa |
- handler = server_descr.app.make_handler()
|
|
|
ae8baa |
- server = await self.loop.create_server(
|
|
|
ae8baa |
- handler,
|
|
|
ae8baa |
- sock=server_sockets[server_name])
|
|
|
ae8baa |
- server_descr.handler = handler
|
|
|
ae8baa |
- server_descr.server = server
|
|
|
ae8baa |
+ runner = web.AppRunner(server_descr.app)
|
|
|
ae8baa |
+ await runner.setup()
|
|
|
ae8baa |
+ site = web.SockSite(runner, server_sockets[server_name])
|
|
|
ae8baa |
+ await site.start()
|
|
|
ae8baa |
+ server_descr.runner = runner
|
|
|
ae8baa |
|
|
|
ae8baa |
self._logger.info("Started server '%s' at '%s'",
|
|
|
ae8baa |
server_name, server_descr.url)
|
|
|
ae8baa |
|
|
|
ae8baa |
async def stop_servers(self):
|
|
|
ae8baa |
for server_descr in self.servers.values():
|
|
|
ae8baa |
- server_descr.server.close()
|
|
|
ae8baa |
- await server_descr.handler.shutdown()
|
|
|
ae8baa |
- await server_descr.server.wait_closed()
|
|
|
ae8baa |
- await server_descr.app.cleanup()
|
|
|
ae8baa |
+ runner = server_descr.runner
|
|
|
ae8baa |
+ await runner.shutdown()
|
|
|
ae8baa |
+ await runner.cleanup()
|
|
|
ae8baa |
|
|
|
ae8baa |
self.servers = {}
|
|
|
ae8baa |
|
|
|
ae8baa |
diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py
|
|
|
ae8baa |
index 5b8d8f3..817410e 100644
|
|
|
ae8baa |
--- a/tests/unit/test_cors_config.py
|
|
|
ae8baa |
+++ b/tests/unit/test_cors_config.py
|
|
|
ae8baa |
@@ -58,11 +58,10 @@ def options_route(app):
|
|
|
ae8baa |
"OPTIONS", "/options_path", _handler)
|
|
|
ae8baa |
|
|
|
ae8baa |
|
|
|
ae8baa |
-def test_add_options_route(cors, options_route):
|
|
|
ae8baa |
+def test_add_options_route(app, cors, options_route):
|
|
|
ae8baa |
"""Test configuring OPTIONS route"""
|
|
|
ae8baa |
-
|
|
|
ae8baa |
with pytest.raises(ValueError,
|
|
|
ae8baa |
- match="/options_path already has OPTIONS handler"):
|
|
|
ae8baa |
+ match="already has OPTIONS handler"):
|
|
|
ae8baa |
cors.add(options_route.resource)
|
|
|
ae8baa |
|
|
|
ae8baa |
|