test: cors tests are now properly async

alexogeny · Aug 18, 2024 · 58b2253 · 58b2253
1 parent 0fffc9f
commit 58b2253
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/tests/config/test_config.py b/tests/config/test_config.py
@@ -58,7 +58,3 @@ def test_singleton_behavior(self):
     def test_no_such_file(self):
         with self.assertRaises(FileNotFoundError):
             Config("non_existent_file.ini")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/config/test_cors.py b/tests/config/test_cors.py
@@ -1,4 +1,3 @@
-import asyncio
 import unittest
 from typing import Any, Dict
 from unittest.mock import AsyncMock, mock_open, patch
@@ -8,7 +7,7 @@
 from zara.server.server import SimpleASGIApp
 
 
-class TestCORS(unittest.TestCase):
+class TestCORS(unittest.IsolatedAsyncioTestCase):
     def setUp(self):
         config_content = """
         [server]
@@ -37,7 +36,7 @@ async def hello_world(request: Dict[str, Any]) -> Dict[str, Any]:
 
         self.app.add_router(self.router)
 
-    def test_cors_headers(self):
+    async def test_cors_headers(self):
         send_mock = AsyncMock()
 
         async def run_app_with_scope(scope):
@@ -51,7 +50,7 @@ async def run_app_with_scope(scope):
             "query_string": b"",
         }
 
-        asyncio.run(run_app_with_scope(scope))
+        await run_app_with_scope(scope)
         send_mock.assert_any_await(
             {
                 "type": "http.response.start",
@@ -72,7 +71,7 @@ async def run_app_with_scope(scope):
             }
         )
 
-    def test_cors_no_origin(self):
+    async def test_cors_no_origin(self):
         send_mock = AsyncMock()
 
         async def run_app_with_scope(scope):
@@ -86,8 +85,7 @@ async def run_app_with_scope(scope):
             "query_string": b"",
         }
 
-        asyncio.run(run_app_with_scope(scope))
-
+        await run_app_with_scope(scope)
         send_mock.assert_any_await(
             {
                 "type": "http.response.start",
@@ -102,7 +100,7 @@ async def run_app_with_scope(scope):
             }
         )
 
-    def test_cors_not_allowed_origin(self):
+    async def test_cors_not_allowed_origin(self):
         send_mock = AsyncMock()
 
         async def run_app_with_scope(scope):
@@ -116,7 +114,7 @@ async def run_app_with_scope(scope):
             "query_string": b"",
         }
 
-        asyncio.run(run_app_with_scope(scope))
+        await run_app_with_scope(scope)
 
         send_mock.assert_any_await(
             {