From 76defca9a6dbc613ec63fe6c7b4a24a8dd550ab2 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Mon, 19 Jul 2021 13:35:03 +0100 Subject: [PATCH] Remove use of pytest-helpers-namespace (#44) Related: https://github.com/ansible-community/molecule/pull/3195 --- conftest.py | 2 -- lib/molecule_podman/test/test_func.py | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/conftest.py b/conftest.py index 6fed110..0bd8370 100644 --- a/conftest.py +++ b/conftest.py @@ -1,3 +1 @@ """Pytest Config.""" - -pytest_plugins = ["helpers_namespace"] diff --git a/lib/molecule_podman/test/test_func.py b/lib/molecule_podman/test/test_func.py index 930dc09..cd339b5 100644 --- a/lib/molecule_podman/test/test_func.py +++ b/lib/molecule_podman/test/test_func.py @@ -3,9 +3,8 @@ import subprocess import molecule_podman -import pytest from molecule import logger -from molecule.test.conftest import change_dir_to +from molecule.test.conftest import change_dir_to, molecule_directory from molecule.util import run_command LOG = logger.get_logger(__name__) @@ -28,8 +27,7 @@ def test_command_init_scenario(temp_dir, DRIVER): assert result.returncode == 0 with change_dir_to(role_directory): - molecule_directory = pytest.helpers.molecule_directory() - scenario_directory = os.path.join(molecule_directory, "test-scenario") + scenario_directory = os.path.join(molecule_directory(), "test-scenario") cmd = [ "molecule", "init",