From 53ffe3c1c07078998d192fb2128fdc5a8fa6868c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 28 Sep 2023 14:25:36 +0200 Subject: [PATCH] dyndns: fix tests --- src/domain.py | 6 ++++-- src/tests/test_domains.py | 12 +++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/domain.py b/src/domain.py index beedf43e0..a503a129c 100644 --- a/src/domain.py +++ b/src/domain.py @@ -715,8 +715,10 @@ class DomainConfigPanel(ConfigPanel): self.entity, self.new_values["recovery_password"] ) # Do not save password in yaml settings - del self.values["recovery_password"] - del self.new_values["recovery_password"] + if "recovery_password" in self.values: + del self.values["recovery_password"] + if "recovery_password" in self.new_values: + del self.new_values["recovery_password"] assert "recovery_password" not in self.future_values super()._apply() diff --git a/src/tests/test_domains.py b/src/tests/test_domains.py index 1bbbb7890..03141b4fe 100644 --- a/src/tests/test_domains.py +++ b/src/tests/test_domains.py @@ -75,12 +75,13 @@ def test_domain_add(): assert TEST_DOMAINS[2] in domain_list()["domains"] -def test_domain_add_subscribe(): +def test_domain_add_and_remove_dyndns(): time.sleep(35) # Dynette blocks requests that happen too frequently assert TEST_DYNDNS_DOMAIN not in domain_list()["domains"] domain_add(TEST_DYNDNS_DOMAIN, dyndns_recovery_password=TEST_DYNDNS_PASSWORD) assert TEST_DYNDNS_DOMAIN in domain_list()["domains"] - + domain_remove(TEST_DYNDNS_DOMAIN, dyndns_recovery_password=TEST_DYNDNS_PASSWORD) + assert TEST_DYNDNS_DOMAIN not in domain_list()["domains"] def test_domain_add_existing_domain(): with pytest.raises(MoulinetteError): @@ -94,13 +95,6 @@ def test_domain_remove(): assert TEST_DOMAINS[1] not in domain_list()["domains"] -def test_domain_remove_unsubscribe(): - time.sleep(35) # Dynette blocks requests that happen too frequently - assert TEST_DYNDNS_DOMAIN in domain_list()["domains"] - domain_remove(TEST_DYNDNS_DOMAIN, dyndns_recovery_password=TEST_DYNDNS_PASSWORD) - assert TEST_DYNDNS_DOMAIN not in domain_list()["domains"] - - def test_main_domain(): current_main_domain = _get_maindomain() assert domain_main_domain()["current_main_domain"] == current_main_domain