majic-ansible-roles Changeset

Changeset - 9ca9c3ada58a

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Branko Majic (branko) - 10 months ago 2023-08-12 00:46:35
branko@majic.rs

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).

2 files changed with 2 insertions and 2 deletions:

roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml

roles/xmpp_server/molecule/default/tests/test_optional.py

0 comments (0 inline, 0 general)

roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

 ---
 xmpp_administrators:
   - jane.doe@domain2
   - mick.doe@domain3
 xmpp_domains:
   - domain2
   - domain3
 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') }}"
 xmpp_server_tls_protocol: "tlsv1+"
 xmpp_server_tls_ciphers: "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-GCM-SHA384:\
 DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-GCM-SHA384:\
 ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:!aNULL:!MD5:!EXPORT"
 # common
 ca_certificates:
   testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"

roles/xmpp_server/molecule/default/tests/test_optional.py

➞

Show inline comments

@@ @@ -41,25 +41,25 @@ Component "proxy.domain2" "proxy65" @@
         assert """VirtualHost "domain3"
 Component "conference.domain3" "muc"
   restrict_room_creation = "local"
 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-0.10').is_installed
     assert host.package('prosody').is_installed
 @pytest.mark.parametrize("port", [
 ,
 ])
 def test_xmpp_c2s_tls_version_and_ciphers(host, port):
     """
     Tests if the correct TLS version and ciphers have been enabled for
     XMPP C2S ports.
     """

0 comments (0 inline, 0 general)