fix molecule tests

bodsch · Jul 19, 2023 · a7b04b7 · a7b04b7
1 parent 188b63e
commit a7b04b7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/collections.yml b/collections.yml
@@ -4,4 +4,3 @@ collections:
   - name: bodsch.core
     version: ">=1.0.19"
   - name: bodsch.scm
-    # version: ">=1.0.19"
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,9 +1,6 @@
 ---
 
-glauth_version: 2.1.0
-
-# glauth_release_download_url: https://github.com/glauth/glauth/releases
-# glauth_release_api_url: https://api.github.com/repos/glauth/glauth/releases
+glauth_version: 2.2.0
 
 glauth_system_user: glauth
 glauth_system_group: glauth

diff --git a/molecule/2.2.0-rc/tests/test_default.py b/molecule/2.2.0-rc/tests/test_default.py
@@ -45,7 +45,7 @@ def read_ansible_yaml(file_name, role_name):
     read_file = None
 
     for e in ["yml", "yaml"]:
-        test_file = "{}.{}".format(file_name, e)
+        test_file = f"{file_name}.{e}"
         if os.path.isfile(test_file):
             read_file = test_file
             break
@@ -110,7 +110,7 @@ def local_facts(host):
 @pytest.mark.parametrize("dirs", [
     "/etc/glauth",
     "/var/lib/glauth",
-    "/usr/local/bin/glauth",
+    "/usr/local/opt/glauth",
 ])
 def test_directories(host, dirs):
     d = host.file(dirs)

diff --git a/molecule/database-config/tests/test_default.py b/molecule/database-config/tests/test_default.py
@@ -45,7 +45,7 @@ def read_ansible_yaml(file_name, role_name):
     read_file = None
 
     for e in ["yml", "yaml"]:
-        test_file = "{}.{}".format(file_name, e)
+        test_file = f"{file_name}.{e}"
         if os.path.isfile(test_file):
             read_file = test_file
             break
@@ -110,7 +110,7 @@ def local_facts(host):
 @pytest.mark.parametrize("dirs", [
     "/etc/glauth",
     "/var/lib/glauth",
-    "/usr/local/bin/glauth",
+    "/usr/local/opt/glauth",
 ])
 def test_directories(host, dirs):
     d = host.file(dirs)

diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
@@ -45,7 +45,7 @@ def read_ansible_yaml(file_name, role_name):
     read_file = None
 
     for e in ["yml", "yaml"]:
-        test_file = "{}.{}".format(file_name, e)
+        test_file = f"{file_name}.{e}"
         if os.path.isfile(test_file):
             read_file = test_file
             break
@@ -110,7 +110,7 @@ def local_facts(host):
 @pytest.mark.parametrize("dirs", [
     "/etc/glauth",
     "/var/lib/glauth",
-    "/usr/local/bin/glauth",
+    "/usr/local/opt/glauth",
 ])
 def test_directories(host, dirs):
     d = host.file(dirs)

diff --git a/molecule/local-config/tests/test_default.py b/molecule/local-config/tests/test_default.py
@@ -45,7 +45,7 @@ def read_ansible_yaml(file_name, role_name):
     read_file = None
 
     for e in ["yml", "yaml"]:
-        test_file = "{}.{}".format(file_name, e)
+        test_file = f"{file_name}.{e}"
         if os.path.isfile(test_file):
             read_file = test_file
             break
@@ -110,7 +110,7 @@ def local_facts(host):
 @pytest.mark.parametrize("dirs", [
     "/etc/glauth",
     "/var/lib/glauth",
-    "/usr/local/bin/glauth",
+    "/usr/local/opt/glauth",
 ])
 def test_directories(host, dirs):
     d = host.file(dirs)