diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 810125cf4a9..dfda4ae3e51 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -2,7 +2,6 @@ from os import environ from pytest import fixture -from pytest_asyncio import fixture as async_fixture from firebolt.client.auth import ServiceAccount, UsernamePassword from firebolt.service.manager import Settings @@ -28,7 +27,7 @@ def must_env(var_name: str) -> str: return environ[var_name] -@async_fixture(scope="session") +@fixture(scope="session") def rm_settings(api_endpoint, username, password) -> Settings: return Settings( server=api_endpoint, diff --git a/tests/integration/dbapi/async/conftest.py b/tests/integration/dbapi/async/conftest.py index 76bae447748..895d4b2d568 100644 --- a/tests/integration/dbapi/async/conftest.py +++ b/tests/integration/dbapi/async/conftest.py @@ -1,10 +1,10 @@ -from pytest_asyncio import fixture as async_fixture +from pytest import fixture from firebolt.async_db import Connection, connect from firebolt.client.auth.base import Auth -@async_fixture +@fixture async def username_password_connection( engine_url: str, database_name: str, @@ -22,7 +22,7 @@ async def username_password_connection( yield connection -@async_fixture +@fixture async def connection( engine_url: str, database_name: str, @@ -40,7 +40,7 @@ async def connection( yield connection -@async_fixture +@fixture async def connection_engine_name( engine_name: str, database_name: str, @@ -59,7 +59,7 @@ async def connection_engine_name( yield connection -@async_fixture +@fixture async def connection_no_engine( database_name: str, password_auth: Auth, diff --git a/tests/integration/dbapi/sync/conftest.py b/tests/integration/dbapi/sync/conftest.py index e8c4447ea08..9beea7962f7 100644 --- a/tests/integration/dbapi/sync/conftest.py +++ b/tests/integration/dbapi/sync/conftest.py @@ -24,7 +24,7 @@ def username_password_connection( @fixture -async def connection( +def connection( engine_url: str, database_name: str, password_auth: Auth,