diff --git a/.gitignore b/.gitignore index 2e88e56ed3..afc3504f24 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,4 @@ site .DS_Store src/molecule/_version.py .vscode -src/molecule/test/resources/.extensions/ +test/resources/.extensions/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 970f80747e..dd0595ad96 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: # Temporary excludes so we can gradually normalize the formatting exclude: > (?x)^( - src/molecule/test/resources/templates/.*| + test/resources/templates/.*| )$ additional_dependencies: - prettier @@ -57,7 +57,7 @@ repos: - id: mypy # empty args needed in order to match mypy cli behavior args: [] - entry: mypy src/ + entry: mypy src/ test/ pass_filenames: false additional_dependencies: - ansible-compat>=4.1.8 diff --git a/pyproject.toml b/pyproject.toml index f8c591cf3f..594864101f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -157,13 +157,13 @@ norecursedirs = [ "build", "dist", "doc", - "src/molecule/test/resources", - "src/molecule/test/scenarios", + "test/resources", + "test/scenarios", ] addopts = "--doctest-modules --durations 10 --color=yes" doctest_optionflags = ["ALLOW_UNICODE", "ELLIPSIS"] junit_suite_name = "molecule_test_suite" -testpaths = "src/molecule/test/" +testpaths = "test/" filterwarnings = [ # treat warnings as errors unless we add them below "error", @@ -216,7 +216,7 @@ parametrize-values-type = "tuple" known-first-party = ["molecule"] [tool.ruff.per-file-ignores] -"src/molecule/test/**.py" = ["S"] +"test/**.py" = ["S"] "src/molecule/*/\\{\\{*/**.py" = ["S"] [tool.setuptools.dynamic] diff --git a/src/molecule/test/__init__.py b/test/__init__.py similarity index 100% rename from src/molecule/test/__init__.py rename to test/__init__.py diff --git a/src/molecule/test/a_unit/__init__.py b/test/a_unit/__init__.py similarity index 100% rename from src/molecule/test/a_unit/__init__.py rename to test/a_unit/__init__.py diff --git a/src/molecule/test/a_unit/command/__init__.py b/test/a_unit/command/__init__.py similarity index 100% rename from src/molecule/test/a_unit/command/__init__.py rename to test/a_unit/command/__init__.py diff --git a/src/molecule/test/a_unit/command/conftest.py b/test/a_unit/command/conftest.py similarity index 100% rename from src/molecule/test/a_unit/command/conftest.py rename to test/a_unit/command/conftest.py diff --git a/src/molecule/test/a_unit/command/init/__init__.py b/test/a_unit/command/init/__init__.py similarity index 100% rename from src/molecule/test/a_unit/command/init/__init__.py rename to test/a_unit/command/init/__init__.py diff --git a/src/molecule/test/a_unit/command/init/test_scenario.py b/test/a_unit/command/init/test_scenario.py similarity index 100% rename from src/molecule/test/a_unit/command/init/test_scenario.py rename to test/a_unit/command/init/test_scenario.py diff --git a/src/molecule/test/a_unit/command/test_base.py b/test/a_unit/command/test_base.py similarity index 99% rename from src/molecule/test/a_unit/command/test_base.py rename to test/a_unit/command/test_base.py index 512ba661c1..aefbec2570 100644 --- a/src/molecule/test/a_unit/command/test_base.py +++ b/test/a_unit/command/test_base.py @@ -49,7 +49,7 @@ def _instance(_base_class, config_instance: config.Config): @pytest.fixture() def _patched_base_setup(mocker): - return mocker.patch("molecule.test.a_unit.command.test_base.ExtendedBase._setup") + return mocker.patch("test.a_unit.command.test_base.ExtendedBase._setup") @pytest.fixture() diff --git a/src/molecule/test/a_unit/command/test_check.py b/test/a_unit/command/test_check.py similarity index 100% rename from src/molecule/test/a_unit/command/test_check.py rename to test/a_unit/command/test_check.py diff --git a/src/molecule/test/a_unit/command/test_cleanup.py b/test/a_unit/command/test_cleanup.py similarity index 100% rename from src/molecule/test/a_unit/command/test_cleanup.py rename to test/a_unit/command/test_cleanup.py diff --git a/src/molecule/test/a_unit/command/test_converge.py b/test/a_unit/command/test_converge.py similarity index 100% rename from src/molecule/test/a_unit/command/test_converge.py rename to test/a_unit/command/test_converge.py diff --git a/src/molecule/test/a_unit/command/test_create.py b/test/a_unit/command/test_create.py similarity index 100% rename from src/molecule/test/a_unit/command/test_create.py rename to test/a_unit/command/test_create.py diff --git a/src/molecule/test/a_unit/command/test_dependency.py b/test/a_unit/command/test_dependency.py similarity index 100% rename from src/molecule/test/a_unit/command/test_dependency.py rename to test/a_unit/command/test_dependency.py diff --git a/src/molecule/test/a_unit/command/test_destroy.py b/test/a_unit/command/test_destroy.py similarity index 100% rename from src/molecule/test/a_unit/command/test_destroy.py rename to test/a_unit/command/test_destroy.py diff --git a/src/molecule/test/a_unit/command/test_idempotence.py b/test/a_unit/command/test_idempotence.py similarity index 100% rename from src/molecule/test/a_unit/command/test_idempotence.py rename to test/a_unit/command/test_idempotence.py diff --git a/src/molecule/test/a_unit/command/test_list.py b/test/a_unit/command/test_list.py similarity index 100% rename from src/molecule/test/a_unit/command/test_list.py rename to test/a_unit/command/test_list.py diff --git a/src/molecule/test/a_unit/command/test_login.py b/test/a_unit/command/test_login.py similarity index 100% rename from src/molecule/test/a_unit/command/test_login.py rename to test/a_unit/command/test_login.py diff --git a/src/molecule/test/a_unit/command/test_matrix.py b/test/a_unit/command/test_matrix.py similarity index 100% rename from src/molecule/test/a_unit/command/test_matrix.py rename to test/a_unit/command/test_matrix.py diff --git a/src/molecule/test/a_unit/command/test_prepare.py b/test/a_unit/command/test_prepare.py similarity index 100% rename from src/molecule/test/a_unit/command/test_prepare.py rename to test/a_unit/command/test_prepare.py diff --git a/src/molecule/test/a_unit/command/test_side_effect.py b/test/a_unit/command/test_side_effect.py similarity index 100% rename from src/molecule/test/a_unit/command/test_side_effect.py rename to test/a_unit/command/test_side_effect.py diff --git a/src/molecule/test/a_unit/command/test_syntax.py b/test/a_unit/command/test_syntax.py similarity index 100% rename from src/molecule/test/a_unit/command/test_syntax.py rename to test/a_unit/command/test_syntax.py diff --git a/src/molecule/test/a_unit/command/test_test.py b/test/a_unit/command/test_test.py similarity index 100% rename from src/molecule/test/a_unit/command/test_test.py rename to test/a_unit/command/test_test.py diff --git a/src/molecule/test/a_unit/command/test_verify.py b/test/a_unit/command/test_verify.py similarity index 100% rename from src/molecule/test/a_unit/command/test_verify.py rename to test/a_unit/command/test_verify.py diff --git a/src/molecule/test/a_unit/conftest.py b/test/a_unit/conftest.py similarity index 99% rename from src/molecule/test/a_unit/conftest.py rename to test/a_unit/conftest.py index e032cef85a..75bbab2339 100644 --- a/src/molecule/test/a_unit/conftest.py +++ b/test/a_unit/conftest.py @@ -24,6 +24,12 @@ from collections.abc import Generator from pathlib import Path from subprocess import CompletedProcess +from test.conftest import ( + molecule_directory, + molecule_ephemeral_directory, + molecule_file, + molecule_scenario_directory, +) from typing import Any from unittest.mock import Mock from uuid import uuid4 @@ -32,12 +38,6 @@ from pytest_mock import MockerFixture from molecule import config, util -from molecule.test.conftest import ( - molecule_directory, - molecule_ephemeral_directory, - molecule_file, - molecule_scenario_directory, -) def write_molecule_file(filename: str, data: Any) -> None: diff --git a/src/molecule/test/a_unit/cookiecutter/__init__.py b/test/a_unit/cookiecutter/__init__.py similarity index 100% rename from src/molecule/test/a_unit/cookiecutter/__init__.py rename to test/a_unit/cookiecutter/__init__.py diff --git a/src/molecule/test/a_unit/cookiecutter/test_molecule.py b/test/a_unit/cookiecutter/test_molecule.py similarity index 100% rename from src/molecule/test/a_unit/cookiecutter/test_molecule.py rename to test/a_unit/cookiecutter/test_molecule.py diff --git a/src/molecule/test/a_unit/dependency/__init__.py b/test/a_unit/dependency/__init__.py similarity index 100% rename from src/molecule/test/a_unit/dependency/__init__.py rename to test/a_unit/dependency/__init__.py diff --git a/src/molecule/test/a_unit/dependency/ansible_galaxy/__init__.py b/test/a_unit/dependency/ansible_galaxy/__init__.py similarity index 100% rename from src/molecule/test/a_unit/dependency/ansible_galaxy/__init__.py rename to test/a_unit/dependency/ansible_galaxy/__init__.py diff --git a/src/molecule/test/a_unit/dependency/ansible_galaxy/test_collections.py b/test/a_unit/dependency/ansible_galaxy/test_collections.py similarity index 100% rename from src/molecule/test/a_unit/dependency/ansible_galaxy/test_collections.py rename to test/a_unit/dependency/ansible_galaxy/test_collections.py diff --git a/src/molecule/test/a_unit/dependency/ansible_galaxy/test_roles.py b/test/a_unit/dependency/ansible_galaxy/test_roles.py similarity index 100% rename from src/molecule/test/a_unit/dependency/ansible_galaxy/test_roles.py rename to test/a_unit/dependency/ansible_galaxy/test_roles.py diff --git a/src/molecule/test/a_unit/dependency/test_shell.py b/test/a_unit/dependency/test_shell.py similarity index 100% rename from src/molecule/test/a_unit/dependency/test_shell.py rename to test/a_unit/dependency/test_shell.py diff --git a/src/molecule/test/a_unit/driver/__init__.py b/test/a_unit/driver/__init__.py similarity index 100% rename from src/molecule/test/a_unit/driver/__init__.py rename to test/a_unit/driver/__init__.py diff --git a/src/molecule/test/a_unit/driver/test_delegated.py b/test/a_unit/driver/test_delegated.py similarity index 99% rename from src/molecule/test/a_unit/driver/test_delegated.py rename to test/a_unit/driver/test_delegated.py index d78d54fd61..6516a3b252 100644 --- a/src/molecule/test/a_unit/driver/test_delegated.py +++ b/test/a_unit/driver/test_delegated.py @@ -19,13 +19,13 @@ # DEALINGS IN THE SOFTWARE. import os +from test.conftest import is_subset import pytest from pytest_mock import MockerFixture from molecule import config from molecule.driver import delegated -from molecule.test.conftest import is_subset @pytest.fixture() diff --git a/src/molecule/test/a_unit/lint/__init__.py b/test/a_unit/lint/__init__.py similarity index 100% rename from src/molecule/test/a_unit/lint/__init__.py rename to test/a_unit/lint/__init__.py diff --git a/src/molecule/test/a_unit/model/__init__.py b/test/a_unit/model/__init__.py similarity index 100% rename from src/molecule/test/a_unit/model/__init__.py rename to test/a_unit/model/__init__.py diff --git a/src/molecule/test/a_unit/model/v2/__init__.py b/test/a_unit/model/v2/__init__.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/__init__.py rename to test/a_unit/model/v2/__init__.py diff --git a/src/molecule/test/a_unit/model/v2/conftest.py b/test/a_unit/model/v2/conftest.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/conftest.py rename to test/a_unit/model/v2/conftest.py diff --git a/src/molecule/test/a_unit/model/v2/test_dependency_section.py b/test/a_unit/model/v2/test_dependency_section.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/test_dependency_section.py rename to test/a_unit/model/v2/test_dependency_section.py diff --git a/src/molecule/test/a_unit/model/v2/test_driver_section.py b/test/a_unit/model/v2/test_driver_section.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/test_driver_section.py rename to test/a_unit/model/v2/test_driver_section.py diff --git a/src/molecule/test/a_unit/model/v2/test_platforms_section.py b/test/a_unit/model/v2/test_platforms_section.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/test_platforms_section.py rename to test/a_unit/model/v2/test_platforms_section.py diff --git a/src/molecule/test/a_unit/model/v2/test_provisioner_section.py b/test/a_unit/model/v2/test_provisioner_section.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/test_provisioner_section.py rename to test/a_unit/model/v2/test_provisioner_section.py diff --git a/src/molecule/test/a_unit/model/v2/test_scenario_section.py b/test/a_unit/model/v2/test_scenario_section.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/test_scenario_section.py rename to test/a_unit/model/v2/test_scenario_section.py diff --git a/src/molecule/test/a_unit/model/v2/test_schema.py b/test/a_unit/model/v2/test_schema.py similarity index 90% rename from src/molecule/test/a_unit/model/v2/test_schema.py rename to test/a_unit/model/v2/test_schema.py index 7142fe304f..4129d158bd 100644 --- a/src/molecule/test/a_unit/model/v2/test_schema.py +++ b/test/a_unit/model/v2/test_schema.py @@ -32,7 +32,7 @@ def test_molecule_schema(): "-v", "--schemafile", "src/molecule/data/molecule.json", - "src/molecule/test/resources/schema_instance_files/valid/molecule.yml", + "test/resources/schema_instance_files/valid/molecule.yml", ] assert run_command(cmd).returncode == 0 @@ -41,6 +41,6 @@ def test_molecule_schema(): "-v", "--schemafile", "src/molecule/data/driver.json", - "src/molecule/test/resources/schema_instance_files/invalid/molecule_delegated.yml", + "test/resources/schema_instance_files/invalid/molecule_delegated.yml", ] assert run_command(cmd).returncode != 0 diff --git a/src/molecule/test/a_unit/model/v2/test_verifier_section.py b/test/a_unit/model/v2/test_verifier_section.py similarity index 100% rename from src/molecule/test/a_unit/model/v2/test_verifier_section.py rename to test/a_unit/model/v2/test_verifier_section.py diff --git a/src/molecule/test/a_unit/provisioner/__init__.py b/test/a_unit/provisioner/__init__.py similarity index 100% rename from src/molecule/test/a_unit/provisioner/__init__.py rename to test/a_unit/provisioner/__init__.py diff --git a/src/molecule/test/a_unit/provisioner/test_ansible.py b/test/a_unit/provisioner/test_ansible.py similarity index 99% rename from src/molecule/test/a_unit/provisioner/test_ansible.py rename to test/a_unit/provisioner/test_ansible.py index f69bb54b00..58f3c61637 100644 --- a/src/molecule/test/a_unit/provisioner/test_ansible.py +++ b/test/a_unit/provisioner/test_ansible.py @@ -21,13 +21,13 @@ import collections import os import re +from test.a_unit.conftest import os_split import pytest from pytest_mock import MockerFixture from molecule import config, util from molecule.provisioner import ansible, ansible_playbooks -from molecule.test.a_unit.conftest import os_split @pytest.fixture() diff --git a/src/molecule/test/a_unit/provisioner/test_ansible_playbook.py b/test/a_unit/provisioner/test_ansible_playbook.py similarity index 100% rename from src/molecule/test/a_unit/provisioner/test_ansible_playbook.py rename to test/a_unit/provisioner/test_ansible_playbook.py diff --git a/src/molecule/test/a_unit/provisioner/test_ansible_playbooks.py b/test/a_unit/provisioner/test_ansible_playbooks.py similarity index 98% rename from src/molecule/test/a_unit/provisioner/test_ansible_playbooks.py rename to test/a_unit/provisioner/test_ansible_playbooks.py index 81f981881f..662df64b0c 100644 --- a/src/molecule/test/a_unit/provisioner/test_ansible_playbooks.py +++ b/test/a_unit/provisioner/test_ansible_playbooks.py @@ -19,12 +19,12 @@ # DEALINGS IN THE SOFTWARE. import os +from test.a_unit.conftest import os_split import pytest from molecule import config, util from molecule.provisioner import ansible_playbooks -from molecule.test.a_unit.conftest import os_split @pytest.fixture() diff --git a/src/molecule/test/a_unit/test_api.py b/test/a_unit/test_api.py similarity index 100% rename from src/molecule/test/a_unit/test_api.py rename to test/a_unit/test_api.py diff --git a/src/molecule/test/a_unit/test_config.py b/test/a_unit/test_config.py similarity index 100% rename from src/molecule/test/a_unit/test_config.py rename to test/a_unit/test_config.py diff --git a/src/molecule/test/a_unit/test_interpolation.py b/test/a_unit/test_interpolation.py similarity index 100% rename from src/molecule/test/a_unit/test_interpolation.py rename to test/a_unit/test_interpolation.py diff --git a/src/molecule/test/a_unit/test_logger.py b/test/a_unit/test_logger.py similarity index 100% rename from src/molecule/test/a_unit/test_logger.py rename to test/a_unit/test_logger.py diff --git a/src/molecule/test/a_unit/test_platforms.py b/test/a_unit/test_platforms.py similarity index 100% rename from src/molecule/test/a_unit/test_platforms.py rename to test/a_unit/test_platforms.py diff --git a/src/molecule/test/a_unit/test_scenario.py b/test/a_unit/test_scenario.py similarity index 100% rename from src/molecule/test/a_unit/test_scenario.py rename to test/a_unit/test_scenario.py diff --git a/src/molecule/test/a_unit/test_scenarios.py b/test/a_unit/test_scenarios.py similarity index 100% rename from src/molecule/test/a_unit/test_scenarios.py rename to test/a_unit/test_scenarios.py diff --git a/src/molecule/test/a_unit/test_scenarios_ordered.py b/test/a_unit/test_scenarios_ordered.py similarity index 100% rename from src/molecule/test/a_unit/test_scenarios_ordered.py rename to test/a_unit/test_scenarios_ordered.py diff --git a/src/molecule/test/a_unit/test_shell.py b/test/a_unit/test_shell.py similarity index 100% rename from src/molecule/test/a_unit/test_shell.py rename to test/a_unit/test_shell.py diff --git a/src/molecule/test/a_unit/test_state.py b/test/a_unit/test_state.py similarity index 100% rename from src/molecule/test/a_unit/test_state.py rename to test/a_unit/test_state.py diff --git a/src/molecule/test/a_unit/test_status.py b/test/a_unit/test_status.py similarity index 100% rename from src/molecule/test/a_unit/test_status.py rename to test/a_unit/test_status.py diff --git a/src/molecule/test/a_unit/test_text.py b/test/a_unit/test_text.py similarity index 100% rename from src/molecule/test/a_unit/test_text.py rename to test/a_unit/test_text.py diff --git a/src/molecule/test/a_unit/test_util.py b/test/a_unit/test_util.py similarity index 99% rename from src/molecule/test/a_unit/test_util.py rename to test/a_unit/test_util.py index 696efb6921..c1f16edb33 100644 --- a/src/molecule/test/a_unit/test_util.py +++ b/test/a_unit/test_util.py @@ -23,6 +23,7 @@ import os import warnings from pathlib import Path +from test.conftest import get_molecule_file, molecule_directory from typing import Any import pytest @@ -32,7 +33,6 @@ from molecule.api import IncompatibleMoleculeRuntimeWarning, MoleculeRuntimeWarning from molecule.console import console from molecule.constants import MOLECULE_HEADER -from molecule.test.conftest import get_molecule_file, molecule_directory from molecule.text import strip_ansi_escape diff --git a/src/molecule/test/a_unit/verifier/__init__.py b/test/a_unit/verifier/__init__.py similarity index 100% rename from src/molecule/test/a_unit/verifier/__init__.py rename to test/a_unit/verifier/__init__.py diff --git a/src/molecule/test/a_unit/verifier/test_ansible.py b/test/a_unit/verifier/test_ansible.py similarity index 100% rename from src/molecule/test/a_unit/verifier/test_ansible.py rename to test/a_unit/verifier/test_ansible.py diff --git a/src/molecule/test/a_unit/verifier/test_testinfra.py b/test/a_unit/verifier/test_testinfra.py similarity index 100% rename from src/molecule/test/a_unit/verifier/test_testinfra.py rename to test/a_unit/verifier/test_testinfra.py diff --git a/src/molecule/test/b_functional/.ansible-lint b/test/b_functional/.ansible-lint similarity index 100% rename from src/molecule/test/b_functional/.ansible-lint rename to test/b_functional/.ansible-lint diff --git a/src/molecule/test/b_functional/__init__.py b/test/b_functional/__init__.py similarity index 100% rename from src/molecule/test/b_functional/__init__.py rename to test/b_functional/__init__.py diff --git a/src/molecule/test/b_functional/conftest.py b/test/b_functional/conftest.py similarity index 99% rename from src/molecule/test/b_functional/conftest.py rename to test/b_functional/conftest.py index 1377bade94..cdabab45f6 100644 --- a/src/molecule/test/b_functional/conftest.py +++ b/test/b_functional/conftest.py @@ -24,6 +24,7 @@ import shutil import subprocess from subprocess import PIPE +from test.conftest import change_dir_to, molecule_directory import pexpect import pytest @@ -33,7 +34,6 @@ import molecule from molecule import logger, util from molecule.app import app -from molecule.test.conftest import change_dir_to, molecule_directory from molecule.text import strip_ansi_color from molecule.util import run_command diff --git a/src/molecule/test/b_functional/test_command.py b/test/b_functional/test_command.py similarity index 99% rename from src/molecule/test/b_functional/test_command.py rename to test/b_functional/test_command.py index 14c15cd7cc..745f37506c 100644 --- a/src/molecule/test/b_functional/test_command.py +++ b/test/b_functional/test_command.py @@ -21,18 +21,18 @@ import os import pathlib - -import pytest -from pytest import FixtureRequest - -from molecule.command import base -from molecule.test.b_functional.conftest import ( +from test.b_functional.conftest import ( idempotence, init_scenario, list_with_format_plain, run_test, verify, ) + +import pytest +from pytest import FixtureRequest + +from molecule.command import base from molecule.util import run_command @@ -334,7 +334,7 @@ def test_sample_collection() -> None: assert ( run_command( ["molecule", "test"], - cwd="src/molecule/test/resources/sample-collection", + cwd="test/resources/sample-collection", ).returncode == 0 ) diff --git a/src/molecule/test/conftest.py b/test/conftest.py similarity index 100% rename from src/molecule/test/conftest.py rename to test/conftest.py diff --git a/src/molecule/test/resources/.yamllint b/test/resources/.yamllint similarity index 100% rename from src/molecule/test/resources/.yamllint rename to test/resources/.yamllint diff --git a/src/molecule/test/resources/invalid_role_template/bad_format/README.md b/test/resources/invalid_role_template/bad_format/README.md similarity index 100% rename from src/molecule/test/resources/invalid_role_template/bad_format/README.md rename to test/resources/invalid_role_template/bad_format/README.md diff --git a/src/molecule/test/resources/invalid_role_template/cookiecutter.json b/test/resources/invalid_role_template/cookiecutter.json similarity index 100% rename from src/molecule/test/resources/invalid_role_template/cookiecutter.json rename to test/resources/invalid_role_template/cookiecutter.json diff --git a/src/molecule/test/resources/molecule.yml b/test/resources/molecule.yml similarity index 100% rename from src/molecule/test/resources/molecule.yml rename to test/resources/molecule.yml diff --git a/src/molecule/test/resources/playbooks/delegated/create.yml b/test/resources/playbooks/delegated/create.yml similarity index 100% rename from src/molecule/test/resources/playbooks/delegated/create.yml rename to test/resources/playbooks/delegated/create.yml diff --git a/src/molecule/test/resources/playbooks/delegated/destroy.yml b/test/resources/playbooks/delegated/destroy.yml similarity index 100% rename from src/molecule/test/resources/playbooks/delegated/destroy.yml rename to test/resources/playbooks/delegated/destroy.yml diff --git a/src/molecule/test/resources/playbooks/delegated/inventory/group_vars/all/all.yml b/test/resources/playbooks/delegated/inventory/group_vars/all/all.yml similarity index 100% rename from src/molecule/test/resources/playbooks/delegated/inventory/group_vars/all/all.yml rename to test/resources/playbooks/delegated/inventory/group_vars/all/all.yml diff --git a/src/molecule/test/resources/roles/molecule/meta/main.yml b/test/resources/roles/molecule/meta/main.yml similarity index 100% rename from src/molecule/test/resources/roles/molecule/meta/main.yml rename to test/resources/roles/molecule/meta/main.yml diff --git a/src/molecule/test/resources/roles/molecule/tasks/main.yml b/test/resources/roles/molecule/tasks/main.yml similarity index 100% rename from src/molecule/test/resources/roles/molecule/tasks/main.yml rename to test/resources/roles/molecule/tasks/main.yml diff --git a/src/molecule/test/resources/sample-collection/CHANGELOG.md b/test/resources/sample-collection/CHANGELOG.md similarity index 100% rename from src/molecule/test/resources/sample-collection/CHANGELOG.md rename to test/resources/sample-collection/CHANGELOG.md diff --git a/src/molecule/test/resources/sample-collection/galaxy.yml b/test/resources/sample-collection/galaxy.yml similarity index 100% rename from src/molecule/test/resources/sample-collection/galaxy.yml rename to test/resources/sample-collection/galaxy.yml diff --git a/src/molecule/test/resources/sample-collection/meta/runtime.yml b/test/resources/sample-collection/meta/runtime.yml similarity index 100% rename from src/molecule/test/resources/sample-collection/meta/runtime.yml rename to test/resources/sample-collection/meta/runtime.yml diff --git a/src/molecule/test/resources/sample-collection/molecule/default/converge.yml b/test/resources/sample-collection/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/resources/sample-collection/molecule/default/converge.yml rename to test/resources/sample-collection/molecule/default/converge.yml diff --git a/src/molecule/test/resources/sample-collection/molecule/default/molecule.yml b/test/resources/sample-collection/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/resources/sample-collection/molecule/default/molecule.yml rename to test/resources/sample-collection/molecule/default/molecule.yml diff --git a/src/molecule/test/resources/sample-collection/roles/get_rich/tasks/main.yml b/test/resources/sample-collection/roles/get_rich/tasks/main.yml similarity index 100% rename from src/molecule/test/resources/sample-collection/roles/get_rich/tasks/main.yml rename to test/resources/sample-collection/roles/get_rich/tasks/main.yml diff --git a/src/molecule/test/resources/schema_instance_files/invalid/molecule_delegated.yml b/test/resources/schema_instance_files/invalid/molecule_delegated.yml similarity index 100% rename from src/molecule/test/resources/schema_instance_files/invalid/molecule_delegated.yml rename to test/resources/schema_instance_files/invalid/molecule_delegated.yml diff --git a/src/molecule/test/resources/schema_instance_files/valid/molecule.yml b/test/resources/schema_instance_files/valid/molecule.yml similarity index 100% rename from src/molecule/test/resources/schema_instance_files/valid/molecule.yml rename to test/resources/schema_instance_files/valid/molecule.yml diff --git a/src/molecule/test/scenarios/.flake8 b/test/scenarios/.flake8 similarity index 100% rename from src/molecule/test/scenarios/.flake8 rename to test/scenarios/.flake8 diff --git a/src/molecule/test/scenarios/cleanup/molecule/default/cleanup.yml b/test/scenarios/cleanup/molecule/default/cleanup.yml similarity index 100% rename from src/molecule/test/scenarios/cleanup/molecule/default/cleanup.yml rename to test/scenarios/cleanup/molecule/default/cleanup.yml diff --git a/src/molecule/test/scenarios/cleanup/molecule/default/converge.yml b/test/scenarios/cleanup/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/cleanup/molecule/default/converge.yml rename to test/scenarios/cleanup/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/cleanup/molecule/default/molecule.yml b/test/scenarios/cleanup/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/cleanup/molecule/default/molecule.yml rename to test/scenarios/cleanup/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/cleanup/molecule/default/tests/test_cleanup.py b/test/scenarios/cleanup/molecule/default/tests/test_cleanup.py similarity index 100% rename from src/molecule/test/scenarios/cleanup/molecule/default/tests/test_cleanup.py rename to test/scenarios/cleanup/molecule/default/tests/test_cleanup.py diff --git a/src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/converge.yml b/test/scenarios/dependency/molecule/ansible-galaxy/converge.yml similarity index 100% rename from src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/converge.yml rename to test/scenarios/dependency/molecule/ansible-galaxy/converge.yml diff --git a/src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml b/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml rename to test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml diff --git a/src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/requirements.yml b/test/scenarios/dependency/molecule/ansible-galaxy/requirements.yml similarity index 100% rename from src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/requirements.yml rename to test/scenarios/dependency/molecule/ansible-galaxy/requirements.yml diff --git a/src/molecule/test/scenarios/dependency/molecule/shell/converge.yml b/test/scenarios/dependency/molecule/shell/converge.yml similarity index 100% rename from src/molecule/test/scenarios/dependency/molecule/shell/converge.yml rename to test/scenarios/dependency/molecule/shell/converge.yml diff --git a/src/molecule/test/scenarios/dependency/molecule/shell/molecule.yml b/test/scenarios/dependency/molecule/shell/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/dependency/molecule/shell/molecule.yml rename to test/scenarios/dependency/molecule/shell/molecule.yml diff --git a/src/molecule/test/scenarios/driver/delegated/meta/main.yml b/test/scenarios/driver/delegated/meta/main.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated/meta/main.yml rename to test/scenarios/driver/delegated/meta/main.yml diff --git a/src/molecule/test/scenarios/driver/delegated/molecule/default/converge.yml b/test/scenarios/driver/delegated/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated/molecule/default/converge.yml rename to test/scenarios/driver/delegated/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/driver/delegated/molecule/default/create.yml b/test/scenarios/driver/delegated/molecule/default/create.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated/molecule/default/create.yml rename to test/scenarios/driver/delegated/molecule/default/create.yml diff --git a/src/molecule/test/scenarios/driver/delegated/molecule/default/destroy.yml b/test/scenarios/driver/delegated/molecule/default/destroy.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated/molecule/default/destroy.yml rename to test/scenarios/driver/delegated/molecule/default/destroy.yml diff --git a/src/molecule/test/scenarios/driver/delegated/molecule/default/molecule.yml b/test/scenarios/driver/delegated/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated/molecule/default/molecule.yml rename to test/scenarios/driver/delegated/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/meta/main.yml b/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/meta/main.yml similarity index 88% rename from src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/meta/main.yml rename to test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/meta/main.yml index 04085aed21..6cc7506a1b 100644 --- a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/meta/main.yml +++ b/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/meta/main.yml @@ -6,6 +6,6 @@ galaxy_info: author: Molecule Developer description: Role to test ansible_compat installation of role namespace: molecule - role_name: delegated-test + role_name: delegated_test license: GPL min_ansible_version: "2.10" diff --git a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/converge.yml b/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/converge.yml rename to test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/create.yml b/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/create.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/create.yml rename to test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/create.yml diff --git a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/destroy.yml b/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/destroy.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/destroy.yml rename to test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/destroy.yml diff --git a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml b/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml rename to test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/host_group_vars/group_vars/example/all.yml b/test/scenarios/host_group_vars/group_vars/example/all.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/group_vars/example/all.yml rename to test/scenarios/host_group_vars/group_vars/example/all.yml diff --git a/src/molecule/test/scenarios/host_group_vars/host_vars/extra-host b/test/scenarios/host_group_vars/host_vars/extra-host similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/host_vars/extra-host rename to test/scenarios/host_group_vars/host_vars/extra-host diff --git a/src/molecule/test/scenarios/host_group_vars/host_vars/instance/all.yml b/test/scenarios/host_group_vars/host_vars/instance/all.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/host_vars/instance/all.yml rename to test/scenarios/host_group_vars/host_vars/instance/all.yml diff --git a/src/molecule/test/scenarios/host_group_vars/hosts b/test/scenarios/host_group_vars/hosts similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/hosts rename to test/scenarios/host_group_vars/hosts diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/default/converge.yml b/test/scenarios/host_group_vars/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/molecule/default/converge.yml rename to test/scenarios/host_group_vars/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/default/group_vars/example/all.yml b/test/scenarios/host_group_vars/molecule/default/group_vars/example/all.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/molecule/default/group_vars/example/all.yml rename to test/scenarios/host_group_vars/molecule/default/group_vars/example/all.yml diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/default/host_vars/instance/all.yml b/test/scenarios/host_group_vars/molecule/default/host_vars/instance/all.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/molecule/default/host_vars/instance/all.yml rename to test/scenarios/host_group_vars/molecule/default/host_vars/instance/all.yml diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml b/test/scenarios/host_group_vars/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml rename to test/scenarios/host_group_vars/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/links/converge.yml b/test/scenarios/host_group_vars/molecule/links/converge.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/molecule/links/converge.yml rename to test/scenarios/host_group_vars/molecule/links/converge.yml diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml b/test/scenarios/host_group_vars/molecule/links/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml rename to test/scenarios/host_group_vars/molecule/links/molecule.yml diff --git a/src/molecule/test/scenarios/idempotence/molecule/raises/converge.yml b/test/scenarios/idempotence/molecule/raises/converge.yml similarity index 100% rename from src/molecule/test/scenarios/idempotence/molecule/raises/converge.yml rename to test/scenarios/idempotence/molecule/raises/converge.yml diff --git a/src/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml b/test/scenarios/idempotence/molecule/raises/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml rename to test/scenarios/idempotence/molecule/raises/molecule.yml diff --git a/src/molecule/test/scenarios/idempotence/tasks/main.yml b/test/scenarios/idempotence/tasks/main.yml similarity index 100% rename from src/molecule/test/scenarios/idempotence/tasks/main.yml rename to test/scenarios/idempotence/tasks/main.yml diff --git a/src/molecule/test/scenarios/interpolation/molecule/default/converge.yml b/test/scenarios/interpolation/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/interpolation/molecule/default/converge.yml rename to test/scenarios/interpolation/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/interpolation/molecule/default/molecule.yml b/test/scenarios/interpolation/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/interpolation/molecule/default/molecule.yml rename to test/scenarios/interpolation/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/overrride_driver/molecule/default/converge.yml b/test/scenarios/overrride_driver/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/overrride_driver/molecule/default/converge.yml rename to test/scenarios/overrride_driver/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml b/test/scenarios/overrride_driver/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml rename to test/scenarios/overrride_driver/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/side_effect/molecule/default/converge.yml b/test/scenarios/side_effect/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/side_effect/molecule/default/converge.yml rename to test/scenarios/side_effect/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/side_effect/molecule/default/molecule.yml b/test/scenarios/side_effect/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/side_effect/molecule/default/molecule.yml rename to test/scenarios/side_effect/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/side_effect/molecule/default/side_effect.yml b/test/scenarios/side_effect/molecule/default/side_effect.yml similarity index 100% rename from src/molecule/test/scenarios/side_effect/molecule/default/side_effect.yml rename to test/scenarios/side_effect/molecule/default/side_effect.yml diff --git a/src/molecule/test/scenarios/side_effect/molecule/default/tests/test_side_effect.py b/test/scenarios/side_effect/molecule/default/tests/test_side_effect.py similarity index 100% rename from src/molecule/test/scenarios/side_effect/molecule/default/tests/test_side_effect.py rename to test/scenarios/side_effect/molecule/default/tests/test_side_effect.py diff --git a/src/molecule/test/scenarios/test_destroy_strategy/molecule/default/converge.yml b/test/scenarios/test_destroy_strategy/molecule/default/converge.yml similarity index 100% rename from src/molecule/test/scenarios/test_destroy_strategy/molecule/default/converge.yml rename to test/scenarios/test_destroy_strategy/molecule/default/converge.yml diff --git a/src/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml b/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml rename to test/scenarios/test_destroy_strategy/molecule/default/molecule.yml diff --git a/src/molecule/test/scenarios/test_destroy_strategy/molecule/default/tests/test_destroy_strategy.py b/test/scenarios/test_destroy_strategy/molecule/default/tests/test_destroy_strategy.py similarity index 100% rename from src/molecule/test/scenarios/test_destroy_strategy/molecule/default/tests/test_destroy_strategy.py rename to test/scenarios/test_destroy_strategy/molecule/default/tests/test_destroy_strategy.py diff --git a/src/molecule/test/scenarios/verifier/.pre-commit-config.yaml b/test/scenarios/verifier/.pre-commit-config.yaml similarity index 100% rename from src/molecule/test/scenarios/verifier/.pre-commit-config.yaml rename to test/scenarios/verifier/.pre-commit-config.yaml diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/converge.yml b/test/scenarios/verifier/molecule/testinfra-pre-commit/converge.yml similarity index 100% rename from src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/converge.yml rename to test/scenarios/verifier/molecule/testinfra-pre-commit/converge.yml diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml b/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml rename to test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/tests/test_testinfra_pre_commit.py b/test/scenarios/verifier/molecule/testinfra-pre-commit/tests/test_testinfra_pre_commit.py similarity index 100% rename from src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/tests/test_testinfra_pre_commit.py rename to test/scenarios/verifier/molecule/testinfra-pre-commit/tests/test_testinfra_pre_commit.py diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra/converge.yml b/test/scenarios/verifier/molecule/testinfra/converge.yml similarity index 100% rename from src/molecule/test/scenarios/verifier/molecule/testinfra/converge.yml rename to test/scenarios/verifier/molecule/testinfra/converge.yml diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml b/test/scenarios/verifier/molecule/testinfra/molecule.yml similarity index 100% rename from src/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml rename to test/scenarios/verifier/molecule/testinfra/molecule.yml diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra/shared/test_shared.py b/test/scenarios/verifier/molecule/testinfra/shared/test_shared.py similarity index 100% rename from src/molecule/test/scenarios/verifier/molecule/testinfra/shared/test_shared.py rename to test/scenarios/verifier/molecule/testinfra/shared/test_shared.py diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra/tests/test_testinfra.py b/test/scenarios/verifier/molecule/testinfra/tests/test_testinfra.py similarity index 100% rename from src/molecule/test/scenarios/verifier/molecule/testinfra/tests/test_testinfra.py rename to test/scenarios/verifier/molecule/testinfra/tests/test_testinfra.py