ref(asyncio integrations): Fix asyncio tests

GH-4699

Author: srothh

tests/integrations/asyncio/test_asyncio.py

@@ -381,55 +381,6 @@ async def test_span_origin(
     assert event["spans"][0]["origin"] == "auto.function.asyncio"
 
 
-@minimum_python_38
-def test_loop_close_patching(sentry_init):
-    sentry_init(integrations=[AsyncioIntegration()])
-
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-
-    try:
-        with patch("asyncio.get_running_loop", return_value=loop):
-            assert not hasattr(loop, "_sentry_flush_patched")
-            AsyncioIntegration.setup_once()
-            assert hasattr(loop, "_sentry_flush_patched")
-            assert loop._sentry_flush_patched is True
-
-    finally:
-        if not loop.is_closed():
-            loop.close()
-
-
-@minimum_python_38
-def test_loop_close_flushes_async_transport(sentry_init):
-    from sentry_sdk.transport import AsyncHttpTransport
-    from unittest.mock import Mock, AsyncMock
-
-    sentry_init(integrations=[AsyncioIntegration()])
-
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-
-    try:
-        with patch("asyncio.get_running_loop", return_value=loop):
-            AsyncioIntegration.setup_once()
-
-        mock_client = Mock()
-        mock_transport = Mock(spec=AsyncHttpTransport)
-        mock_client.transport = mock_transport
-        mock_client.close = AsyncMock(return_value=None)
-
-        with patch("sentry_sdk.get_client", return_value=mock_client):
-            loop.close()
-
-        mock_client.close.assert_called_once()
-        mock_client.close.assert_awaited_once()
-
-    except Exception:
-        if not loop.is_closed():
-            loop.close()
-
-
 @minimum_python_38
 @pytest.mark.asyncio(loop_scope="module")
 async def test_internal_tasks_not_wrapped(sentry_init, capture_events):
@@ -477,3 +428,60 @@ async def internal_task():
     assert (
         len(internal_spans) == 0
     ), f"Internal task should NOT have been traced. All spans: {[s.get('description') for s in transaction.get('spans', [])]}"
+
+
+@minimum_python_38
+def test_loop_close_patching(sentry_init):
+    sentry_init(integrations=[AsyncioIntegration()])
+
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+
+    try:
+        with patch("asyncio.get_running_loop", return_value=loop):
+            assert not hasattr(loop, "_sentry_flush_patched")
+            AsyncioIntegration.setup_once()
+            assert hasattr(loop, "_sentry_flush_patched")
+            assert loop._sentry_flush_patched is True
+
+    finally:
+        if not loop.is_closed():
+            loop.close()
+
+
+@minimum_python_38
+def test_loop_close_flushes_async_transport(sentry_init):
+    from sentry_sdk.transport import AsyncHttpTransport
+    from unittest.mock import Mock, AsyncMock
+
+    sentry_init(integrations=[AsyncioIntegration()])
+
+    # Save the current event loop to restore it later
+    try:
+        original_loop = asyncio.get_event_loop()
+    except RuntimeError:
+        original_loop = None
+
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+
+    try:
+        with patch("asyncio.get_running_loop", return_value=loop):
+            AsyncioIntegration.setup_once()
+
+        mock_client = Mock()
+        mock_transport = Mock(spec=AsyncHttpTransport)
+        mock_client.transport = mock_transport
+        mock_client.close = AsyncMock(return_value=None)
+
+        with patch("sentry_sdk.get_client", return_value=mock_client):
+            loop.close()
+
+        mock_client.close.assert_called_once()
+        mock_client.close.assert_awaited_once()
+
+    finally:
+        if not loop.is_closed():
+            loop.close()
+        if original_loop:
+            asyncio.set_event_loop(original_loop)