Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
from typing import Generator
import pytest
from opengeodeweb_microservice.database.connection import init_database, get_session
from opengeodeweb_microservice.database.data import Data
Expand All @@ -8,13 +9,13 @@


@pytest.fixture(scope="session", autouse=True)
def setup_database():
def setup_database() -> Generator[None, None, None]:
init_database(DB_PATH)
yield
_cleanup_database(DB_PATH)


def _cleanup_database(db_path: str):
def _cleanup_database(db_path: str) -> None:
try:
session = get_session()
session.close()
Expand All @@ -29,7 +30,7 @@ def _cleanup_database(db_path: str):


@pytest.fixture(autouse=True)
def clean_database():
def clean_database() -> Generator[None, None, None]:
with get_session() as session:
session = get_session()
session.query(Data).delete()
Expand Down
4 changes: 2 additions & 2 deletions tests/test_database.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from opengeodeweb_microservice.database.data import Data


def test_data_crud_operations(clean_database):
def test_data_crud_operations(clean_database: None) -> None:
data = Data.create(
geode_object="test_object",
viewer_object="test_viewer",
Expand All @@ -22,7 +22,7 @@ def test_data_crud_operations(clean_database):
assert non_existent is None


def test_data_with_additional_files(clean_database):
def test_data_with_additional_files(clean_database: None) -> None:
files = ["file1.txt", "file2.txt"]
data = Data.create(
geode_object="test_files",
Expand Down