From bc9bf9ec770cc8169cfb39b98295b79ca1eb81f3 Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Mon, 30 Oct 2017 08:39:21 +0100 Subject: [PATCH] Remove obsolete RRL support from functional tests --- tests-extra/tests/security/dnsheader/test.py | 3 --- tests-extra/tools/dnstest/server.py | 9 --------- 2 files changed, 12 deletions(-) diff --git a/tests-extra/tests/security/dnsheader/test.py b/tests-extra/tests/security/dnsheader/test.py index a32fa736b..e7ae73c00 100644 --- a/tests-extra/tests/security/dnsheader/test.py +++ b/tests-extra/tests/security/dnsheader/test.py @@ -10,9 +10,6 @@ knot = t.server("knot") zone = t.zone("example.com.") t.link(zone, knot) -# Update configuration -knot.ratelimit = 5 # Check for crashes also in rate-limit code - t.start() knot.zone_wait(zone) diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py index 0bbb2f553..9fbeb290a 100644 --- a/tests-extra/tools/dnstest/server.py +++ b/tests-extra/tools/dnstest/server.py @@ -122,9 +122,6 @@ class Server(object): self.zones = dict() - self.ratelimit = None - self.ratelimit_slip = None - self.ratelimit_whitelist = None self.tcp_reply_timeout = None self.max_udp_payload = None self.max_udp4_payload = None @@ -1026,12 +1023,6 @@ class Knot(Server): self._str(s, "max-udp-payload", self.max_udp_payload) self._str(s, "max-ipv4-udp-payload", self.max_udp4_payload) self._str(s, "max-ipv6-udp-payload", self.max_udp6_payload) - if self.ratelimit is not None: - s.item_str("rate-limit", self.ratelimit) - if self.ratelimit_slip is not None: - s.item_str("rate-limit-slip", self.ratelimit_slip) - if self.ratelimit_whitelist is not None: - s.item_str("rate-limit-whitelist", self.ratelimit_whitelist) s.end() s.begin("control")