Changeset - c26fda98ff72
[Not reviewed]
0 3 0
Branko Majic (branko) - 5 months ago 2023-11-19 18:04:14
branko@majic.rs
MAR-181: Refactor the Prosody package version checks:

- Move the Prosody package version check into default set of tests.
3 files changed with 2 insertions and 17 deletions:
0 comments (0 inline, 0 general)
roles/xmpp_server/molecule/default/tests/test_default.py
Show inline comments
 
@@ -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):
roles/xmpp_server/molecule/default/tests/test_mandatory.py
Show inline comments
 
@@ -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
roles/xmpp_server/molecule/default/tests/test_optional.py
Show inline comments
 
@@ -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
0 comments (0 inline, 0 general)