From d67f56bce75ee0963cfff821aedaad7e5588cefb Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 27 Nov 2023 14:25:31 +0100 Subject: [PATCH] remove subdir fixtures --- src/conftest.py | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/conftest.py b/src/conftest.py index 36f5451..93b2ada 100644 --- a/src/conftest.py +++ b/src/conftest.py @@ -31,7 +31,16 @@ def pytest_addoption(parser): @pytest.fixture(scope="session", autouse=True) -def dirmanager(request) -> DirManager: +def DIR(request) -> DirManager: + """Fixture holding test directories + + DIR.OUTPUT + DIR.SESSION + DIR.RECORDS + DIR.STATES + DIR.RESULTS + DIR.PROGRESS""" + output_dir = request.config.getoption("--output_dir") assert output_dir is not None, "required pytest command line argument not given" output_dir = Path(output_dir) @@ -51,22 +60,6 @@ def dotenv_config(request) -> dict[str, str]: return dotenv_values(dotenv_path) # type: ignore -@pytest.fixture(scope="session", autouse=True) -def RECORDS(dirmanager) -> Path: - assert isinstance(dirmanager, DirManager) - return dirmanager.RECORDS - - -@pytest.fixture(scope="session", autouse=True) -def STATES(dirmanager) -> Path: - return dirmanager.STATES - - -@pytest.fixture(scope="session", autouse=True) -def RESULTS(dirmanager) -> Path: - return dirmanager.RESULTS - - @pytest.hookimpl(tryfirst=True, hookwrapper=True) def pytest_runtest_makereport(item, call): """saves traceback when test fails"""