From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 7 Jun 2019 15:13:29 +0000 (+0200)
Subject: rec: Clean up RPZ zones between unit tests
X-Git-Tag: dnsdist-1.4.0-rc1~128^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ecb8bbc3e098df24dc85ce93e5e7845bbbc2b3a;p=thirdparty%2Fpdns.git

rec: Clean up RPZ zones between unit tests
---

diff --git a/pdns/recursordist/test-syncres_cc3.cc b/pdns/recursordist/test-syncres_cc3.cc
index 715679a6c3..361016ce39 100644
--- a/pdns/recursordist/test-syncres_cc3.cc
+++ b/pdns/recursordist/test-syncres_cc3.cc
@@ -513,6 +513,7 @@ BOOST_AUTO_TEST_CASE(test_nameserver_ipv4_rpz) {
   zone->setName("Unit test policy 0");
   zone->addNSIPTrigger(Netmask(ns, 32), std::move(pol));
   auto luaconfsCopy = g_luaconfs.getCopy();
+  luaconfsCopy.dfe.clearZones();
   luaconfsCopy.dfe.addZone(zone);
   g_luaconfs.setState(luaconfsCopy);
 
@@ -554,6 +555,7 @@ BOOST_AUTO_TEST_CASE(test_nameserver_ipv6_rpz) {
   zone->setName("Unit test policy 0");
   zone->addNSIPTrigger(Netmask(ns, 128), std::move(pol));
   auto luaconfsCopy = g_luaconfs.getCopy();
+  luaconfsCopy.dfe.clearZones();
   luaconfsCopy.dfe.addZone(zone);
   g_luaconfs.setState(luaconfsCopy);
 
@@ -596,6 +598,7 @@ BOOST_AUTO_TEST_CASE(test_nameserver_name_rpz) {
   zone->setName("Unit test policy 0");
   zone->addNSTrigger(nsName, std::move(pol));
   auto luaconfsCopy = g_luaconfs.getCopy();
+  luaconfsCopy.dfe.clearZones();
   luaconfsCopy.dfe.addZone(zone);
   g_luaconfs.setState(luaconfsCopy);
 
@@ -639,6 +642,7 @@ BOOST_AUTO_TEST_CASE(test_nameserver_name_rpz_disabled) {
   zone->addNSIPTrigger(Netmask(ns, 128), DNSFilterEngine::Policy(pol));
   zone->addNSTrigger(nsName, std::move(pol));
   auto luaconfsCopy = g_luaconfs.getCopy();
+  luaconfsCopy.dfe.clearZones();
   luaconfsCopy.dfe.addZone(zone);
   g_luaconfs.setState(luaconfsCopy);