From 910c78d4e0a1e69538e3ce237175d4fcda872795 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 14 Sep 2023 08:05:22 +0100 Subject: [PATCH] Switch to the correct fixture usage Signed-off-by: Pedro Algarvio --- tests/pytests/unit/states/test_file.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/pytests/unit/states/test_file.py b/tests/pytests/unit/states/test_file.py index 107acea9ac4..ba88a4b3e28 100644 --- a/tests/pytests/unit/states/test_file.py +++ b/tests/pytests/unit/states/test_file.py @@ -7,19 +7,17 @@ import salt.states.file as file from tests.support.mock import MagicMock, call, create_autospec, patch -@pytest.fixture(autouse=True) -def setup_loader(request): - setup_loader_modules = { +@pytest.fixture +def configure_loader_modules(minion_opts): + return { file: { "__opts__": {"test": False}, "__env__": "base", } } - with pytest.helpers.loader_mock(request, setup_loader_modules) as loader_mock: - yield loader_mock -@pytest.fixture() +@pytest.fixture def fake_remove(): fake_remove_mod = create_autospec(filemod.remove) with patch.dict(file.__salt__, {"file.remove": fake_remove_mod}):