From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Fri, 1 Feb 2019 12:57:20 +0000 (+0100)
Subject: tests-extra: fix always publishing CDS in onlinesign_rollover
X-Git-Tag: v2.8.0~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18fa67f925dc7a04f50e522e897fbfef5ce051b0;p=thirdparty%2Fknot-dns.git

tests-extra: fix always publishing CDS in onlinesign_rollover
---

diff --git a/tests-extra/tests/modules/onlinesign_rollovers/test.py b/tests-extra/tests/modules/onlinesign_rollovers/test.py
index f5eb2829df..6e6504a12b 100644
--- a/tests-extra/tests/modules/onlinesign_rollovers/test.py
+++ b/tests-extra/tests/modules/onlinesign_rollovers/test.py
@@ -177,7 +177,8 @@ def cds_submission():
 child.zonefile_sync = 24 * 60 * 60
 
 child.dnssec(child_zone).ksk_sbm_check = [ parent ]
-child.add_module(child_zone, ModOnlineSign("ECDSAP384SHA384", key_size="384", prop_delay=11, ksc = [ parent ], ksci = 2, ksk_shared=True))
+child.add_module(child_zone, ModOnlineSign("ECDSAP384SHA384", key_size="384", prop_delay=11, ksc = [ parent ],
+                                           ksci = 2, ksk_shared=True, cds_publish="always"))
 
 # parameters
 ZONE = "example.com."
diff --git a/tests-extra/tools/dnstest/module.py b/tests-extra/tools/dnstest/module.py
index 5a4c45b65a..6e3d51a510 100644
--- a/tests-extra/tools/dnstest/module.py
+++ b/tests-extra/tools/dnstest/module.py
@@ -185,7 +185,8 @@ class ModOnlineSign(KnotModule):
 
     mod_name = "onlinesign"
 
-    def __init__(self, algorithm=None, key_size=None, prop_delay=3600, ksc=[ ], ksci=999, ksk_life=9999, ksk_shared=False):
+    def __init__(self, algorithm=None, key_size=None, prop_delay=3600, ksc=[ ],
+                 ksci=999, ksk_life=9999, ksk_shared=False, cds_publish="rollover"):
         super().__init__()
         self.algorithm = algorithm
         self.key_size = key_size
@@ -196,6 +197,7 @@ class ModOnlineSign(KnotModule):
         self.ksci = ksci
         self.ksk_life = ksk_life
         self.ksk_shared = ksk_shared
+        self.cds_publish = cds_publish
 
     def get_conf(self, conf=None):
         if not conf:
@@ -223,6 +225,7 @@ class ModOnlineSign(KnotModule):
                 conf.item("ksk-submission", "blahblah")
             conf.item("ksk-lifetime", self.ksk_life)
             conf.item("ksk-shared", self.ksk_shared)
+            conf.item("cds-cdnskey-publish", self.cds_publish)
             conf.end()
 
             conf.begin(self.conf_name)