cleanup

Author: sentrivana

tests/integrations/asyncpg/test_asyncpg.py

@@ -11,7 +11,20 @@
 
 import os
 import threading
+import datetime
+from contextlib import contextmanager
+from unittest import mock
+
+import asyncpg
+import pytest
+import pytest_asyncio
+from asyncpg import connect, Connection
 
+from sentry_sdk import capture_message, start_transaction
+from sentry_sdk.integrations.asyncpg import AsyncPGIntegration
+from sentry_sdk.consts import SPANDATA
+from sentry_sdk.tracing_utils import record_sql_queries
+from tests.conftest import ApproxDict
 
 PG_HOST = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_HOST", "localhost")
 PG_PORT = int(os.getenv("SENTRY_PYTHON_TEST_POSTGRES_PORT", "5432"))
@@ -28,22 +41,6 @@ def _get_db_name():
 
 PG_NAME = _get_db_name()
 
-import datetime
-from contextlib import contextmanager
-from unittest import mock
-
-import asyncpg
-import pytest
-import pytest_asyncio
-from asyncpg import connect, Connection
-
-from sentry_sdk import capture_message, start_transaction
-from sentry_sdk.integrations.asyncpg import AsyncPGIntegration
-from sentry_sdk.consts import SPANDATA
-from sentry_sdk.tracing_utils import record_sql_queries
-from tests.conftest import ApproxDict
-
-
 PG_CONNECTION_URI = "postgresql://{}:{}@{}/{}".format(
     PG_USER, PG_PASSWORD, PG_HOST, PG_NAME
 )
@@ -65,29 +62,6 @@ def _get_db_name():
 
 @pytest_asyncio.fixture(autouse=True)
 async def _clean_pg():
-    # Connect to the default postgres database to create our test database
-    default_conn_uri = "postgresql://{}:{}@{}/{}".format(
-        PG_USER, PG_PASSWORD, PG_HOST, PG_NAME_BASE
-    )
-
-    # Create the test database if it doesn't exist
-    try:
-        default_conn = await connect(default_conn_uri)
-        try:
-            # Check if database exists, create if not
-            result = await default_conn.fetchval(
-                "SELECT 1 FROM pg_database WHERE datname = $1", PG_NAME
-            )
-            if not result:
-                await default_conn.execute(f'CREATE DATABASE "{PG_NAME}"')
-        finally:
-            await default_conn.close()
-    except Exception:
-        # If we can't connect to default postgres db, assume our test db already exists
-        # or that we're connecting to the same database (PG_NAME == PG_NAME_BASE)
-        pass
-
-    # Now connect to our test database and set up the table
     conn = await connect(PG_CONNECTION_URI)
     await conn.execute("DROP TABLE IF EXISTS users")
     await conn.execute(