From 83a97798a0332a91add9c183d45cd92deb8bad42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 9 Apr 2020 15:46:38 +0200 Subject: [PATCH] Don't create a new domain at each test --- src/yunohost/tests/test_permission.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/yunohost/tests/test_permission.py b/src/yunohost/tests/test_permission.py index 635e64665..1defbfb75 100644 --- a/src/yunohost/tests/test_permission.py +++ b/src/yunohost/tests/test_permission.py @@ -79,12 +79,13 @@ def clean_user_groups_permission(): def setup_function(function): clean_user_groups_permission() - markers = {m.name: {'args':m.args, 'kwargs':m.kwargs} for m in function.__dict__.get("pytestmark",[])} global maindomain global other_domains maindomain = _get_maindomain() + markers = {m.name: {'args':m.args, 'kwargs':m.kwargs} for m in function.__dict__.get("pytestmark",[])} + if "other_domains" in markers: other_domains = ["domain_%s.dev" % string.ascii_lowercase[number] for number in range(markers['other_domains']['kwargs']['number'])] for domain in other_domains: @@ -94,6 +95,8 @@ def setup_function(function): # Dirty patch of DNS resolution. Force the DNS to 127.0.0.1 address even if dnsmasq have the public address. # Mainly used for 'can_access_webpage' function dns_cache = {(maindomain, 443, 0, 1): [(2, 1, 6, '', ('127.0.0.1', 443))]} + for domain in other_domains: + dns_cache[(domain, 443, 0, 1)] = [(2, 1, 6, '', ('127.0.0.1', 443))] def new_getaddrinfo(*args): try: return dns_cache[args] @@ -135,6 +138,12 @@ def teardown_function(function): pass +def teardown_module(module): + global other_domains + for domain in other_domains: + domain_remove(domain) + + @pytest.fixture(autouse=True) def check_LDAP_db_integrity_call(): check_LDAP_db_integrity()