simplify patched_ci_env for tests

ansible · Nov 16, 2020 · 5fddbb4 · 5fddbb4
1 parent 5178e65
commit 5fddbb4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/molecule/test/unit/command/test_base.py b/lib/molecule/test/unit/command/test_base.py
@@ -89,7 +89,9 @@ def _patched_sysexit(mocker):
 @pytest.fixture
 def _patched_ci_env(request, monkeypatch):
     """Parametrize tests with and without CI env vars."""
-    for envvar, value in request.param.items():
+    envvars = {"CI": None, "TRAVIS": None, "GITHUB_ACTIONS": None, "GITLAB_CI": None}
+    envvars.update(request.param)
+    for envvar, value in envvars.items():
         if value is None:
             monkeypatch.delenv(envvar, raising=False)
         else:
@@ -227,7 +229,7 @@ def test_execute_cmdline_scenarios_exit_nodestroy(
 @pytest.mark.parametrize(
     "_patched_ci_env",
     [
-        {"CI": None, "TRAVIS": None, "GITHUB_ACTIONS": None, "GITLAB_CI": None},
+        {},
         {"CI": "true", "TRAVIS": "true"},
         {"CI": "true", "GITHUB_ACTIONS": "true"},
         {"CI": "true", "GITLAB_CI": "true"},