test: consolidate default environment variables

Use pytest to provide default environment variables for testing instead of defining them in multiple places. This would enable users to run pytest outisde tox without having to define extra variables. Signed-off-by: Sorin Sbarnea <[email protected]>
ansible · Oct 24, 2019 · b4d1465 · b4d1465
1 parent 7ae6ea7
commit b4d1465
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/conftest.py b/conftest.py
@@ -1 +1,11 @@
+import os
+import pytest
+
 pytest_plugins = ['helpers_namespace']
+
+
+@pytest.fixture
+def environ():
+    # adds extra environment variables that may be needed during testing
+    if not os.environ.get('TEST_BASE_IMAGE', ""):
+        os.environ['TEST_BASE_IMAGE'] = 'pycontribs/centos:7'
diff --git a/molecule/test/functional/docker/test_scenarios.py b/molecule/test/functional/docker/test_scenarios.py
@@ -218,10 +218,11 @@ def test_command_test_overrides_driver(
     indirect=['scenario_to_test', 'driver_name', 'scenario_name'],
 )
 def test_command_test_builds_local_molecule_image(
-    scenario_to_test, with_scenario, scenario_name, driver_name
+    scenario_to_test, with_scenario, scenario_name, driver_name, environ
 ):
+    # with mock.patch.dict('os.environ', environ, clear=True):
     try:
-        image = os.environ.get('TEST_BASE_IMAGE', "docker.io/pycontribs/centos:7")
+        image = os.environ['TEST_BASE_IMAGE']
         cmd = sh.docker.bake('rmi', 'molecule_local/{}'.format(image), '--force')
         pytest.helpers.run_command(cmd)
     except sh.ErrorReturnCode:

diff --git a/tox.ini b/tox.ini
@@ -21,7 +21,6 @@ passenv = *
 setenv =
     ANSIBLE_CALLABLE_WHITELIST={env:ANSIBLE_CALLABLE_WHITELIST:timer,profile_roles}
     PYTHONDONTWRITEBYTECODE=1
-    TEST_BASE_IMAGE=docker.io/pycontribs/centos:7
     # -n auto used only on unit as is not supported by functional yet
     unit: PYTEST_ADDOPTS=molecule/test/unit/ --cov={toxinidir}/molecule/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto}
     functional: PYTEST_ADDOPTS=molecule/test/functional/ {env:PYTEST_ADDOPTS:}