Skip to content

test: Fix async fixtures #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 14, 2023
Merged

test: Fix async fixtures #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b51f8a0
test: Change async fixture to trino
ptiurin Aug 11, 2023
84a62ad
back to normal fixture
ptiurin Aug 11, 2023
4c71594
fix conftest
ptiurin Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions tests/integration/dbapi/async/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -22,7 +22,7 @@ async def username_password_connection(
yield connection


@async_fixture
@fixture
async def connection(
engine_url: str,
database_name: str,
Expand All @@ -40,7 +40,7 @@ async def connection(
yield connection


@async_fixture
@fixture
async def connection_engine_name(
engine_name: str,
database_name: str,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/dbapi/sync/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def username_password_connection(


@fixture
async def connection(
def connection(
engine_url: str,
database_name: str,
password_auth: Auth,
Expand Down