From 3f070edb610f942a4f081dc87bad7cf8a9efaabe Mon Sep 17 00:00:00 2001 From: selfhoster1312 Date: Fri, 10 May 2024 17:33:53 +0200 Subject: [PATCH] Ensure secondarydomain/subdomain are configured, only list once --- src/tests/test_sso_and_portalapi.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/tests/test_sso_and_portalapi.py b/src/tests/test_sso_and_portalapi.py index 1b9c4d7d2..c2afa6107 100644 --- a/src/tests/test_sso_and_portalapi.py +++ b/src/tests/test_sso_and_portalapi.py @@ -49,6 +49,11 @@ def setup_module(module): if "bob" not in userlist: user_create("bob", maindomain, dummy_password, fullname="Bob Marley") + domainlist = domain_list()["domains"] + domains = [ domain for domain in [ subdomain, secondarydomain ] if domain not in domainlist ] + for domain in domains: + domain_add(domain) + app_install( os.path.join(get_test_apps_dir(), "hellopy_ynh"), args=f"domain={maindomain}&init_main_permission=visitors", @@ -63,11 +68,10 @@ def teardown_module(module): app_remove("hellopy") - if subdomain in domain_list()["domains"]: - domain_remove(subdomain) - if secondarydomain in domain_list()["domains"]: - domain_remove(secondarydomain) - + domainlist = domain_list()["domains"] + domains = [ domain for domain in [ subdomain, secondarydomain ] if domain in domainlist ] + for domain in domains: + domain_remove(domain) def login(session, logged_as, logged_on=None):