fix some tests

cmcmarrow · Aug 28, 2023 · 5a5adfe · 5a5adfe
1 parent 0b1d2b0
commit 5a5adfe
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/tests/pytests/functional/pillar/test_git_pillar.py b/tests/pytests/functional/pillar/test_git_pillar.py
@@ -105,7 +105,7 @@ def _test_env(pillar_opts, grains):
         pillar_opts,
         grains,
         {
-            "https://github.com/saltstack/salt-test-pillar-gitfs-2.git": [
+            "other https://github.com/saltstack/salt-test-pillar-gitfs-2.git": [
                 {"env": "other_env"}
             ]
         },
@@ -187,46 +187,44 @@ def test_pygit2_missing_env_dynamic(pygit2_pillar_opts, grains):
     _test_missing_env_dynamic(pygit2_pillar_opts, grains)
 
 
-def _test_env_dynamic(pillar_opts, grains):
+def _test_pillarenv_dynamic(pillar_opts, grains):
+    pillar_opts["pillarenv"] = "branch"
     data = _get_ext_pillar(
         "minion",
         pillar_opts,
         grains,
-        {
-            "__env__ https://github.com/saltstack/salt-test-pillar-gitfs-2.git": [
-                {"env": "other_env"}
-            ]
-        },
+        "__env__ https://github.com/saltstack/salt-test-pillar-gitfs.git",
     )
-    assert data == {"other": "env"}
+    assert data == {"key": "data"}
 
 
 @skipif_no_gitpython
-def test_gitpython_env_dynamic(gitpython_pillar_opts, grains):
-    _test_env_dynamic(gitpython_pillar_opts, grains)
+def test_gitpython_pillarenv_dynamic(gitpython_pillar_opts, grains):
+    _test_pillarenv_dynamic(gitpython_pillar_opts, grains)
 
 
 @skipif_no_pygit2
-def test_pygit2_env_dynamic(pygit2_pillar_opts, grains):
-    _test_env_dynamic(pygit2_pillar_opts, grains)
+def test_pygit2_pillarenv_dynamic(pygit2_pillar_opts, grains):
+    _test_pillarenv_dynamic(pygit2_pillar_opts, grains)
 
 
-def _test_pillarenv_dynamic(pillar_opts, grains):
+def _test_multiple(pillar_opts, grains):
     pillar_opts["pillarenv"] = "branch"
     data = _get_ext_pillar(
         "minion",
         pillar_opts,
         grains,
         "__env__ https://github.com/saltstack/salt-test-pillar-gitfs.git",
+        "other https://github.com/saltstack/salt-test-pillar-gitfs-2.git",
     )
     assert data == {"key": "data"}
 
 
 @skipif_no_gitpython
-def test_gitpython_pillarenv_dynamic(gitpython_pillar_opts, grains):
-    _test_pillarenv_dynamic(gitpython_pillar_opts, grains)
+def test_gitpython_multiple(gitpython_pillar_opts, grains):
+    _test_multiple(gitpython_pillar_opts, grains)
 
 
 @skipif_no_pygit2
-def test_pygit2_pillarenv_dynamic(pygit2_pillar_opts, grains):
-    _test_pillarenv_dynamic(pygit2_pillar_opts, grains)
+def test_pygit2_multiple(pygit2_pillar_opts, grains):
+    _test_multiple(pygit2_pillar_opts, grains)