Skip to content

Commit aa10e90

Browse files
committed
missing fixture
1 parent dc7afea commit aa10e90

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

services/api-server/tests/unit/_with_db/conftest.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import sys
1111
from collections.abc import AsyncGenerator, AsyncIterator, Callable, Iterable
1212
from pathlib import Path
13+
from typing import TypedDict
1314

1415
import httpx
1516
import pytest
@@ -33,6 +34,7 @@
3334
from simcore_postgres_database.models.api_keys import api_keys
3435
from simcore_postgres_database.models.products import products
3536
from simcore_postgres_database.models.users import users
37+
from simcore_sdk.node_ports_v2 import port
3638
from simcore_service_api_server.core.application import init_app
3739
from simcore_service_api_server.core.settings import PostgresSettings
3840

@@ -73,8 +75,19 @@ def docker_compose_file(
7375
return dst_path
7476

7577

78+
class PostgreServiceInfoDict(TypedDict):
79+
dsn: str
80+
user: str
81+
password: str
82+
host: str
83+
port: int
84+
datbase: str
85+
86+
7687
@pytest.fixture(scope="session")
77-
def postgres_service(docker_services, docker_ip, docker_compose_file: Path) -> dict:
88+
def postgres_service(
89+
docker_services, docker_ip, docker_compose_file: Path
90+
) -> PostgreServiceInfoDict:
7891
# check docker-compose's environ is resolved properly
7992
config = yaml.safe_load(docker_compose_file.read_text())
8093
environ = config["services"]["postgres"]["environment"]
@@ -110,12 +123,14 @@ def is_postgres_responsive() -> bool:
110123
)
111124

112125
config["dsn"] = dsn
113-
return config
126+
return PostgreServiceInfoDict(**config)
114127

115128

116129
@pytest.fixture(scope="session")
117-
def sync_engine(postgres_service: str) -> Iterable[sqlalchemy.engine.Engine]:
118-
_engine: sqlalchemy.engine.Engine = sa.create_engine(url=postgres_service)
130+
def sync_engine(
131+
postgres_service: PostgreServiceInfoDict,
132+
) -> Iterable[sqlalchemy.engine.Engine]:
133+
_engine: sqlalchemy.engine.Engine = sa.create_engine(url=postgres_service["dsn"])
119134
yield _engine
120135
_engine.dispose()
121136

0 commit comments

Comments
 (0)