diff --git a/SOURCES/e64b95848f3253157d831f4934841fceeaf9b2e3.patch b/SOURCES/e64b95848f3253157d831f4934841fceeaf9b2e3.patch new file mode 100644 index 0000000..6c74bb6 --- /dev/null +++ b/SOURCES/e64b95848f3253157d831f4934841fceeaf9b2e3.patch @@ -0,0 +1,23 @@ +From e64b95848f3253157d831f4934841fceeaf9b2e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Thu, 14 Nov 2019 12:54:47 +0100 +Subject: [PATCH] Test instance type by isinstance, not issubclass + +Fixes https://github.com/aio-libs/aiohttp-cors/issues/277 +--- + tests/unit/test_cors_config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py +index 817410e..d494e20 100644 +--- a/tests/unit/test_cors_config.py ++++ b/tests/unit/test_cors_config.py +@@ -103,7 +103,7 @@ def test_static_resource(app, cors): + "/file", "/", name="dynamic_named_route") + assert len(app.router.keys()) == 1 + for resource in list(app.router.resources()): +- if issubclass(resource, web.StaticResource): ++ if isinstance(resource, web.StaticResource): + cors.add(resource) + assert len(app.router.keys()) == 1 + diff --git a/SOURCES/eb4f5a4bb28f8260d4edc32969e838d9abace051.patch b/SOURCES/eb4f5a4bb28f8260d4edc32969e838d9abace051.patch new file mode 100644 index 0000000..504f21d --- /dev/null +++ b/SOURCES/eb4f5a4bb28f8260d4edc32969e838d9abace051.patch @@ -0,0 +1,63 @@ +From eb4f5a4bb28f8260d4edc32969e838d9abace051 Mon Sep 17 00:00:00 2001 +From: Andrew Svetlov +Date: Mon, 15 Oct 2018 21:32:48 +0300 +Subject: [PATCH] Fix tests + +--- + tests/integration/test_real_browser.py | 18 ++++++++---------- + tests/unit/test_cors_config.py | 5 ++--- + 2 files changed, 10 insertions(+), 13 deletions(-) + +diff --git a/tests/integration/test_real_browser.py b/tests/integration/test_real_browser.py +index a5c9030..5dff79a 100644 +--- a/tests/integration/test_real_browser.py ++++ b/tests/integration/test_real_browser.py +@@ -193,22 +193,20 @@ class ResourceView(web.View, CorsViewMixin): + + # Start servers. + for server_name, server_descr in self.servers.items(): +- handler = server_descr.app.make_handler() +- server = await self.loop.create_server( +- handler, +- sock=server_sockets[server_name]) +- server_descr.handler = handler +- server_descr.server = server ++ runner = web.AppRunner(server_descr.app) ++ await runner.setup() ++ site = web.SockSite(runner, server_sockets[server_name]) ++ await site.start() ++ server_descr.runner = runner + + self._logger.info("Started server '%s' at '%s'", + server_name, server_descr.url) + + async def stop_servers(self): + for server_descr in self.servers.values(): +- server_descr.server.close() +- await server_descr.handler.shutdown() +- await server_descr.server.wait_closed() +- await server_descr.app.cleanup() ++ runner = server_descr.runner ++ await runner.shutdown() ++ await runner.cleanup() + + self.servers = {} + +diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py +index 5b8d8f3..817410e 100644 +--- a/tests/unit/test_cors_config.py ++++ b/tests/unit/test_cors_config.py +@@ -58,11 +58,10 @@ def options_route(app): + "OPTIONS", "/options_path", _handler) + + +-def test_add_options_route(cors, options_route): ++def test_add_options_route(app, cors, options_route): + """Test configuring OPTIONS route""" +- + with pytest.raises(ValueError, +- match="/options_path already has OPTIONS handler"): ++ match="already has OPTIONS handler"): + cors.add(options_route.resource) + +