tests: remove old reliances on xmpp.main

This commit is contained in:
Alexandre Aubin 2024-06-10 00:40:13 +02:00
parent 2e59393943
commit caa26ee005
2 changed files with 7 additions and 11 deletions

View file

@ -147,21 +147,19 @@ def test_change_main_domain():
# Domain settings testing # Domain settings testing
def test_domain_config_get_default(): def test_domain_config_get_default():
assert domain_config_get(TEST_DOMAINS[0], "feature.xmpp.xmpp") == 1 assert domain_config_get(TEST_DOMAINS[0], "feature.mail.mail_out") == 1
assert domain_config_get(TEST_DOMAINS[1], "feature.xmpp.xmpp") == 0
def test_domain_config_get_export(): def test_domain_config_get_export():
assert domain_config_get(TEST_DOMAINS[0], export=True)["xmpp"] == 1 assert domain_config_get(TEST_DOMAINS[0], export=True)["mail_out"] == 1
assert domain_config_get(TEST_DOMAINS[1], export=True)["xmpp"] == 0
def test_domain_config_set(): def test_domain_config_set():
assert domain_config_get(TEST_DOMAINS[1], "feature.xmpp.xmpp") == 0 assert domain_config_get(TEST_DOMAINS[1], "feature.mail.mail_out") == 1
domain_config_set(TEST_DOMAINS[1], "feature.xmpp.xmpp", "yes") domain_config_set(TEST_DOMAINS[1], "feature.mail.mail_out", "no")
assert domain_config_get(TEST_DOMAINS[1], "feature.xmpp.xmpp") == 1 assert domain_config_get(TEST_DOMAINS[1], "feature.mail.mail_out") == 0
def test_domain_configs_unknown(): def test_domain_configs_unknown():
with pytest.raises(YunohostError): with pytest.raises(YunohostError):
domain_config_get(TEST_DOMAINS[2], "feature.xmpp.xmpp.xmpp") domain_config_get(TEST_DOMAINS[2], "feature.foo.bar.baz")

View file

@ -338,7 +338,7 @@ def check_LDAP_db_integrity():
def check_permission_for_apps(): def check_permission_for_apps():
# We check that the for each installed apps we have at last the "main" permission # We check that the for each installed apps we have at last the "main" permission
# and we don't have any permission linked to no apps. The only exception who is not liked to an app # and we don't have any permission linked to no apps. The only exception who is not liked to an app
# is mail, xmpp, and sftp # is mail, and sftp
app_perms = user_permission_list(ignore_system_perms=True)["permissions"].keys() app_perms = user_permission_list(ignore_system_perms=True)["permissions"].keys()
@ -397,7 +397,6 @@ def test_permission_list():
res = user_permission_list(full=True)["permissions"] res = user_permission_list(full=True)["permissions"]
assert "mail.main" in res assert "mail.main" in res
assert "xmpp.main" in res
assert "wiki.main" in res assert "wiki.main" in res
assert "blog.main" in res assert "blog.main" in res
@ -615,7 +614,6 @@ def test_permission_delete_doesnt_existing(mocker):
assert "wiki.main" in res assert "wiki.main" in res
assert "blog.main" in res assert "blog.main" in res
assert "mail.main" in res assert "mail.main" in res
assert "xmpp.main" in res
def test_permission_delete_main_without_force(mocker): def test_permission_delete_main_without_force(mocker):