forks/microblog.pub
1
0
Fork 1
mirror of https://git.sr.ht/~tsileo/microblog.pub synced 2024-12-22 05:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweak tests

Browse source
This commit is contained in:
Thomas Sileo 2022-07-10 15:29:51 +02:00
parent c3c4475e24
commit 229feb23db
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/conftest.py
View file

@ -4,13 +4,11 @@ import pytest
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from app.database import Base from app.database import Base
from app.database import SessionLocal
from app.database import async_engine from app.database import async_engine
from app.database import async_session from app.database import async_session
from app.database import engine from app.database import engine
from app.main import app from app.main import app
from tests.factories import _Session
# _Session = orm.sessionmaker(bind=engine, autocommit=False, autoflush=False)
@pytest.fixture @pytest.fixture
@ -26,14 +24,14 @@ async def async_db_session():
@pytest.fixture @pytest.fixture
def db() -> Generator: def db() -> Generator:
Base.metadata.create_all(bind=engine) Base.metadata.create_all(bind=engine)
# sess = orm.sessionmaker(bind=engine)()
yield _Session
# yield orm.scoped_session(orm.sessionmaker(bind=engine))
try: try:
Base.metadata.drop_all(bind=engine) yield SessionLocal()
except Exception: finally:
# XXX: for some reason, the teardown occasionally fails because of this try:
pass Base.metadata.drop_all(bind=engine)
except Exception:
# XXX: for some reason, the teardown occasionally fails because of this
pass
@pytest.fixture @pytest.fixture

4
tests/factories.py
View file

@ -11,10 +11,10 @@ from app import actor
from app import models from app import models
from app.actor import RemoteActor from app.actor import RemoteActor
from app.ap_object import RemoteObject from app.ap_object import RemoteObject
from app.database import engine from app.database import SessionLocal
from app.database import now from app.database import now
_Session = orm.scoped_session(orm.sessionmaker(bind=engine)) _Session = orm.scoped_session(SessionLocal)
def generate_key() -> tuple[str, str]: def generate_key() -> tuple[str, str]: