diff --git a/tests/conftest.py b/tests/helpers.py similarity index 76% rename from tests/conftest.py rename to tests/helpers.py index 5f496fe..b0c94b3 100644 --- a/tests/conftest.py +++ b/tests/helpers.py @@ -3,8 +3,6 @@ from typing import Any from unittest import mock -import pytest - from yamk.command.make import MakeCommand TEST_DATA_ROOT = pathlib.Path(__file__).resolve().parent.joinpath("data") @@ -41,18 +39,3 @@ def get_make_command(**kwargs: Any) -> MakeCommand: setattr(mock_args, key, value) return MakeCommand(mock_args) - - -@pytest.fixture -def mock_args() -> mock.MagicMock: - args = mock.MagicMock() - args.directory = "." - args.cookbook = TEST_COOKBOOK - args.cookbook_type = None - args.verbosity = 0 - args.bare = False - args.time = False - args.force = False - args.dry_run = False - args.extra = [] - return args diff --git a/tests/yamk/command/test_make/test_arguments.py b/tests/yamk/command/test_make/test_arguments.py index 28bbc9a..320de19 100644 --- a/tests/yamk/command/test_make/test_arguments.py +++ b/tests/yamk/command/test_make/test_arguments.py @@ -1,6 +1,6 @@ from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "arguments.yaml" diff --git a/tests/yamk/command/test_make/test_dag.py b/tests/yamk/command/test_make/test_dag.py index e2b3c9f..8af9d21 100644 --- a/tests/yamk/command/test_make/test_dag.py +++ b/tests/yamk/command/test_make/test_dag.py @@ -2,7 +2,7 @@ import pytest -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "dag.yaml" diff --git a/tests/yamk/command/test_make/test_exceptions.py b/tests/yamk/command/test_make/test_exceptions.py index 17761ff..cb2fde6 100644 --- a/tests/yamk/command/test_make/test_exceptions.py +++ b/tests/yamk/command/test_make/test_exceptions.py @@ -2,7 +2,7 @@ import pytest -from tests.conftest import get_make_command, runner_exit_failure, runner_exit_success +from tests.helpers import get_make_command, runner_exit_failure, runner_exit_success COOKBOOK = "exceptions.yaml" diff --git a/tests/yamk/command/test_make/test_functions.py b/tests/yamk/command/test_make/test_functions.py index 5a52149..ff95b10 100644 --- a/tests/yamk/command/test_make/test_functions.py +++ b/tests/yamk/command/test_make/test_functions.py @@ -1,6 +1,6 @@ from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "functions.yaml" diff --git a/tests/yamk/command/test_make/test_make.py b/tests/yamk/command/test_make/test_make.py index 2a2fcf0..cad5a76 100644 --- a/tests/yamk/command/test_make/test_make.py +++ b/tests/yamk/command/test_make/test_make.py @@ -1,6 +1,6 @@ from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "make.yaml" diff --git a/tests/yamk/command/test_make/test_overrides.py b/tests/yamk/command/test_make/test_overrides.py index c4783b7..acc3aae 100644 --- a/tests/yamk/command/test_make/test_overrides.py +++ b/tests/yamk/command/test_make/test_overrides.py @@ -1,6 +1,6 @@ from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "overrides.yaml" diff --git a/tests/yamk/command/test_make/test_regex.py b/tests/yamk/command/test_make/test_regex.py index 1732e18..0cc09aa 100644 --- a/tests/yamk/command/test_make/test_regex.py +++ b/tests/yamk/command/test_make/test_regex.py @@ -1,6 +1,6 @@ from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "regex.yaml" diff --git a/tests/yamk/command/test_make/test_requirements.py b/tests/yamk/command/test_make/test_requirements.py index e767ad2..11670f1 100644 --- a/tests/yamk/command/test_make/test_requirements.py +++ b/tests/yamk/command/test_make/test_requirements.py @@ -1,7 +1,7 @@ import os from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "requirements.yaml" diff --git a/tests/yamk/command/test_make/test_should_build.py b/tests/yamk/command/test_make/test_should_build.py index 983dd58..b9dedd1 100644 --- a/tests/yamk/command/test_make/test_should_build.py +++ b/tests/yamk/command/test_make/test_should_build.py @@ -1,7 +1,7 @@ import os from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "should_build.yaml" diff --git a/tests/yamk/command/test_make/test_variables.py b/tests/yamk/command/test_make/test_variables.py index 6c8fa83..ec9157a 100644 --- a/tests/yamk/command/test_make/test_variables.py +++ b/tests/yamk/command/test_make/test_variables.py @@ -1,7 +1,7 @@ import os from unittest import mock -from tests.conftest import get_make_command, runner_exit_success +from tests.helpers import get_make_command, runner_exit_success COOKBOOK = "variables.yaml"