From 9ca9c3ada58a43cfb572b9bee477f62d016f39a4 2023-08-12 00:46:35 From: Branko Majic Date: 2023-08-12 00:46:35 Subject: [PATCH] MAR-181: Use Debian-provided Prosody package for testing optional parameter: - Still properly tests the role, while at the same time making it possible to use custom apt repository for Debian Buster (due to Prosody project dropping all repository archives for it). --- diff --git a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml index 79ceaacc742bb09d3ff762ae23fdea4aeea74703..9c0fa1120ad291cd309c2bde2ab9ed8eb905f2b8 100644 --- a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml @@ -9,7 +9,7 @@ xmpp_domains: xmpp_ldap_base_dn: dc=local xmpp_ldap_password: prosodypassword xmpp_ldap_server: ldap-server -xmpp_prosody_package: prosody-0.10 +xmpp_prosody_package: prosody xmpp_server_archive_expiration: "1w" xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.cert.pem') }}" xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.key.pem') }}" diff --git a/roles/xmpp_server/molecule/default/tests/test_optional.py b/roles/xmpp_server/molecule/default/tests/test_optional.py index adf6fb7ec4b5b32a0289498dbf66f136edccdf22..cefa5365ce81fc48ec4278bd5adb427be538b9fb 100644 --- a/roles/xmpp_server/molecule/default/tests/test_optional.py +++ b/roles/xmpp_server/molecule/default/tests/test_optional.py @@ -50,7 +50,7 @@ def test_correct_prosody_package_installed(host): Tests if correct Prosody package has been installed. """ - assert host.package('prosody-0.10').is_installed + assert host.package('prosody').is_installed @pytest.mark.parametrize("port", [