tests-extra: remove workaround for empty server port

diff --git a/tests-extra/tests/dnssec/dnskey_algorithms/test.py b/tests-extra/tests/dnssec/dnskey_algorithms/test.py
index 131ba073a6cb9a38a027a46b6facdbffe22d64ef..b318e7fe70952d26bf43f6f37694a212eee87acf 100644 (file)
--- a/tests-extra/tests/dnssec/dnskey_algorithms/test.py
+++ b/tests-extra/tests/dnssec/dnskey_algorithms/test.py
@@ -51,7 +51,7 @@ GEN="1450000000"
 PAST="189000000"
 FUTU="2711000000"
 
-knot.port = 1234 # this will be overwritten, but we need dummy
+# needed for keymgr
 knot.gen_confile()
 
 ## Valid scenarios

diff --git a/tests-extra/tests/dnssec/dnskey_timestamps/test.py b/tests-extra/tests/dnssec/dnskey_timestamps/test.py
index eb498df909418cd273b21821822a42791530fcd7..132acef20ad110d6473a439db92f14f0d538cad2 100644 (file)
--- a/tests-extra/tests/dnssec/dnskey_timestamps/test.py
+++ b/tests-extra/tests/dnssec/dnskey_timestamps/test.py
@@ -47,8 +47,7 @@ knot.dnssec(zone).manual = True
 ZONE = "example.com."
 WAIT_SIGN = 2
 
-# we need to have confile to run keymgr
-knot.port = 1234 # this will be overwritten, but we need dummy
+# needed for keymgr
 knot.gen_confile()
 
 # generate initial keys (one always enabled, one for testing)

diff --git a/tests-extra/tests/dnssec/keytag_conflict/test.py b/tests-extra/tests/dnssec/keytag_conflict/test.py
index 86d68afeee6b16862964b0ae5cffd5d7ebfa5c6d..4d7d73c87bfba64b0d9b2be9be6d52bc88fa42b9 100644 (file)
--- a/tests-extra/tests/dnssec/keytag_conflict/test.py
+++ b/tests-extra/tests/dnssec/keytag_conflict/test.py
@@ -50,7 +50,7 @@ knot.zonefile_sync = "0"
 # install KASP db (one always enabled, one for testing)
 shutil.copytree(os.path.join(t.data_dir, "keys"), knot.keydir)
 
-knot.port = 1234 # this will be overwritten, but we need dummy
+# needed for keymgr
 knot.gen_confile()
 
 # parameters

diff --git a/tests-extra/tests/dnssec/offline_ksk/test.py b/tests-extra/tests/dnssec/offline_ksk/test.py
index 4e3ac863316c1d7531da33ec259f182a0221f186..fa21c03c5400bc2849c1296cb689b8742734fba4 100644 (file)
--- a/tests-extra/tests/dnssec/offline_ksk/test.py
+++ b/tests-extra/tests/dnssec/offline_ksk/test.py
@@ -96,13 +96,15 @@ knot.dnssec(zone).ksk_lifetime = 300 # this can be possibly left also infinity
 knot.dnssec(zone).propagation_delay = TICK-2
 knot.dnssec(zone).offline_ksk = "on"
 knot.dnssec(zone).cds_publish = "rollover"
-knot.port = 1234 # dummy, will be overwritten
+
+# needed for keymgr
 knot.gen_confile()
 
 signer = t.server("knot")
 t.link(zone, signer)
 signer.zones[ZONE].dnssec = knot.zones[ZONE].dnssec
-signer.port = 1235
+
+# needed for keymgr
 signer.gen_confile()
 
 def tickf(when):

diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py
index 4958ad47a46245117980373e9a77ae47608148ed..c2d7701d7b4fd9f7e0f9ddd9cd2c0f539c824c74 100644 (file)
--- a/tests-extra/tools/dnstest/server.py
+++ b/tests-extra/tools/dnstest/server.py
@@ -119,7 +119,7 @@ class Server(object):
         self.version = None
 
         self.addr = None
-        self.port = None
+        self.port = 0 # Needed for keymgr when port not yet generated
         self.fixed_port = False
         self.ctlport = None
         self.external = False