chore: remove event_loop fixture (#891)

Author: jackwotherspoon

tests/conftest.py

@@ -57,19 +57,6 @@ def pytest_collection_modifyitems(config: Any, items: Any) -> None:
             item.add_marker(skip_private_ip)
 
 
-@pytest.fixture
-def event_loop() -> Generator:
-    """
-    Creates an event loop to use for testing.
-    """
-    loop: asyncio.AbstractEventLoop = asyncio.new_event_loop()
-    yield loop
-    # close loop gracefully
-    if loop.is_running():
-        loop.call_soon_threadsafe(loop.stop)
-    loop.close()
-
-
 @pytest.fixture
 def connect_string() -> str:
     """
@@ -149,13 +136,13 @@ def mock_instance() -> FakeCSQLInstance:
 async def instance(
     mock_instance: FakeCSQLInstance,
     fake_credentials: Credentials,
-    event_loop: asyncio.AbstractEventLoop,
 ) -> AsyncGenerator[Instance, None]:
     """
     Instance with mocked API calls.
     """
+    loop = asyncio.get_running_loop()
     # generate client key pair
-    keys = event_loop.create_task(generate_keys())
+    keys = asyncio.create_task(generate_keys())
     _, client_key = await keys
 
     with patch("google.cloud.sql.connector.utils.default") as mock_auth:
@@ -179,7 +166,7 @@ async def instance(
                 f"{mock_instance.project}:{mock_instance.region}:{mock_instance.name}",
                 "pg8000",
                 keys,
-                event_loop,
+                loop,
             )
 
             yield instance

tests/unit/test_instance.py

@@ -38,19 +38,19 @@
 
 
 @pytest.fixture
-def test_rate_limiter(event_loop: asyncio.AbstractEventLoop) -> AsyncRateLimiter:
-    return AsyncRateLimiter(max_capacity=1, rate=1 / 2, loop=event_loop)
+def test_rate_limiter() -> AsyncRateLimiter:
+    return AsyncRateLimiter(max_capacity=1, rate=1 / 2)
 
 
 @pytest.mark.asyncio
 async def test_Instance_init(
-    fake_credentials: Credentials, event_loop: asyncio.AbstractEventLoop
+    fake_credentials: Credentials,
 ) -> None:
     """
     Test to check whether the __init__ method of Instance
     can tell if the connection string that's passed in is formatted correctly.
     """
-
+    event_loop = asyncio.get_running_loop()
     connect_string = "test-project:test-region:test-instance"
     keys = asyncio.wrap_future(
         asyncio.run_coroutine_threadsafe(generate_keys(), event_loop), loop=event_loop
@@ -71,13 +71,12 @@ async def test_Instance_init(
 
 
 @pytest.mark.asyncio
-async def test_Instance_init_bad_credentials(
-    event_loop: asyncio.AbstractEventLoop,
-) -> None:
+async def test_Instance_init_bad_credentials() -> None:
     """
     Test to check whether the __init__ method of Instance
     throws proper error for bad credentials arg type.
     """
+    event_loop = asyncio.get_running_loop()
     connect_string = "test-project:test-region:test-instance"
     keys = asyncio.wrap_future(
         asyncio.run_coroutine_threadsafe(generate_keys(), event_loop), loop=event_loop
@@ -331,11 +330,12 @@ async def test_get_preferred_ip_CloudSQLIPTypeError(instance: Instance) -> None:
 
 @pytest.mark.asyncio
 async def test_ClientResponseError(
-    fake_credentials: Credentials, event_loop: asyncio.AbstractEventLoop
+    fake_credentials: Credentials,
 ) -> None:
     """
     Test that detailed error message is applied to ClientResponseError.
     """
+    event_loop = asyncio.get_running_loop()
     # mock Cloud SQL Admin API calls with exceptions
     keys = asyncio.wrap_future(
         asyncio.run_coroutine_threadsafe(generate_keys(), event_loop), loop=event_loop

tests/unit/test_rate_limiter.py

@@ -23,13 +23,12 @@
 
 
 @pytest.mark.asyncio
-async def test_rate_limiter_throttles_requests(
-    event_loop: asyncio.AbstractEventLoop,
-) -> None:
+async def test_rate_limiter_throttles_requests() -> None:
     """Test to check whether rate limiter will throttle incoming requests."""
+    event_loop = asyncio.get_running_loop()
     counter = 0
     # allow 2 requests to go through every 5 seconds
-    rate_limiter = AsyncRateLimiter(max_capacity=2, rate=1 / 5, loop=event_loop)
+    rate_limiter = AsyncRateLimiter(max_capacity=2, rate=1 / 5)
 
     async def increment() -> None:
         await rate_limiter.acquire()
@@ -53,13 +52,12 @@ async def increment() -> None:
 
 
 @pytest.mark.asyncio
-async def test_rate_limiter_completes_all_tasks(
-    event_loop: asyncio.AbstractEventLoop,
-) -> None:
+async def test_rate_limiter_completes_all_tasks() -> None:
     """Test to check all requests will go through rate limiter successfully."""
+    event_loop = asyncio.get_running_loop()
     counter = 0
     # allow 1 request to go through per second
-    rate_limiter = AsyncRateLimiter(max_capacity=1, rate=1, loop=event_loop)
+    rate_limiter = AsyncRateLimiter(max_capacity=1, rate=1)
 
     async def increment() -> None:
         await rate_limiter.acquire()