From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 6 Nov 2018 14:22:31 +0000 (+0100)
Subject: tests-extra: remove workaround for empty server port
X-Git-Tag: v2.8.0~183^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efed3faeabbb2fb2c6d044066a57a28d3cbe4084;p=thirdparty%2Fknot-dns.git

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 131ba073a6..b318e7fe70 100644
--- 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 eb498df909..132acef20a 100644
--- 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 86d68afeee..4d7d73c87b 100644
--- 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 4e3ac86331..fa21c03c54 100644
--- 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 4958ad47a4..c2d7701d7b 100644
--- 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