From 94582de25de34672e94495254f43452410da60f5 Mon Sep 17 00:00:00 2001 From: Charlie Mordant Date: Mon, 11 May 2020 17:38:02 +0200 Subject: [PATCH] use symbolic links instead of replicating files --- molecule/kvmonlyvg/tests/conftest.py | 22 +--------------------- molecule/kvmsinglelv/tests/conftest.py | 22 +--------------------- 2 files changed, 2 insertions(+), 42 deletions(-) mode change 100644 => 120000 molecule/kvmonlyvg/tests/conftest.py mode change 100644 => 120000 molecule/kvmsinglelv/tests/conftest.py diff --git a/molecule/kvmonlyvg/tests/conftest.py b/molecule/kvmonlyvg/tests/conftest.py deleted file mode 100644 index 7bd2743..0000000 --- a/molecule/kvmonlyvg/tests/conftest.py +++ /dev/null @@ -1,21 +0,0 @@ -"""PyTest Fixtures.""" -from __future__ import absolute_import -import os -import pytest - - -def pytest_runtest_setup(item): - """Run tests only when under molecule with testinfra installed.""" - try: - import testinfra - except ImportError: - pytest.skip("Test requires testinfra", allow_module_level=True) - if "MOLECULE_INVENTORY_FILE" in os.environ: - pytest.testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ["MOLECULE_INVENTORY_FILE"] - ).get_hosts("all") - else: - pytest.skip( - "Test should run only from inside molecule.", - allow_module_level=True - ) diff --git a/molecule/kvmonlyvg/tests/conftest.py b/molecule/kvmonlyvg/tests/conftest.py new file mode 120000 index 0000000..add822b --- /dev/null +++ b/molecule/kvmonlyvg/tests/conftest.py @@ -0,0 +1 @@ +../../default/tests/conftest.py \ No newline at end of file diff --git a/molecule/kvmsinglelv/tests/conftest.py b/molecule/kvmsinglelv/tests/conftest.py deleted file mode 100644 index 7bd2743..0000000 --- a/molecule/kvmsinglelv/tests/conftest.py +++ /dev/null @@ -1,21 +0,0 @@ -"""PyTest Fixtures.""" -from __future__ import absolute_import -import os -import pytest - - -def pytest_runtest_setup(item): - """Run tests only when under molecule with testinfra installed.""" - try: - import testinfra - except ImportError: - pytest.skip("Test requires testinfra", allow_module_level=True) - if "MOLECULE_INVENTORY_FILE" in os.environ: - pytest.testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ["MOLECULE_INVENTORY_FILE"] - ).get_hosts("all") - else: - pytest.skip( - "Test should run only from inside molecule.", - allow_module_level=True - ) diff --git a/molecule/kvmsinglelv/tests/conftest.py b/molecule/kvmsinglelv/tests/conftest.py new file mode 120000 index 0000000..add822b --- /dev/null +++ b/molecule/kvmsinglelv/tests/conftest.py @@ -0,0 +1 @@ +../../default/tests/conftest.py \ No newline at end of file