diff --git a/roles/xmpp_server/molecule/default/tests/test_default.py b/roles/xmpp_server/molecule/default/tests/test_default.py index 014208a029f5df7fd3e8c7d80a4655eb8b09f7b8..f67dcf71fd751980c9504ce4eadb5d018f87b3e7 100644 --- a/roles/xmpp_server/molecule/default/tests/test_default.py +++ b/roles/xmpp_server/molecule/default/tests/test_default.py @@ -10,7 +10,7 @@ testinfra_hosts += testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('deprecated') -def test_supporting_packages_installed(host): +def test_installed_packages(host): """ Tests if all the necessary supporting packages have been installed. @@ -19,6 +19,7 @@ def test_supporting_packages_installed(host): assert host.package('python-apt').is_installed assert host.package('lua-ldap').is_installed assert host.package('prosody-modules').is_installed + assert host.package('prosody').is_installed def test_prosody_user(host): diff --git a/roles/xmpp_server/molecule/default/tests/test_mandatory.py b/roles/xmpp_server/molecule/default/tests/test_mandatory.py index 5f516f9e65168c967e9500fa102561515dcb93bf..6ad6196ad88ca3816f2a6e2ce8d9dd42acbe9d57 100644 --- a/roles/xmpp_server/molecule/default/tests/test_mandatory.py +++ b/roles/xmpp_server/molecule/default/tests/test_mandatory.py @@ -39,14 +39,6 @@ Component "proxy.domain1" "proxy65" proxy65_acl = { "domain1" }""" in config.content_string -def test_correct_prosody_package_installed(host): - """ - Tests if correct Prosody package has been installed. - """ - - assert host.package('prosody').is_installed - - @pytest.mark.parametrize("port", [ 5222, 5223 diff --git a/roles/xmpp_server/molecule/default/tests/test_optional.py b/roles/xmpp_server/molecule/default/tests/test_optional.py index cefa5365ce81fc48ec4278bd5adb427be538b9fb..58784a4939d5b1acc8adc4ea1ec39b24a5b7cb31 100644 --- a/roles/xmpp_server/molecule/default/tests/test_optional.py +++ b/roles/xmpp_server/molecule/default/tests/test_optional.py @@ -45,14 +45,6 @@ Component "proxy.domain3" "proxy65" proxy65_acl = { "domain3" }""" in config.content_string -def test_correct_prosody_package_installed(host): - """ - Tests if correct Prosody package has been installed. - """ - - assert host.package('prosody').is_installed - - @pytest.mark.parametrize("port", [ 5222, 5223