]> granicus.if.org Git - pdns/commitdiff
rec: Clean up RPZ zones between unit tests
authorRemi Gacogne <remi.gacogne@powerdns.com>
Fri, 7 Jun 2019 15:13:29 +0000 (17:13 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Fri, 7 Jun 2019 15:38:24 +0000 (17:38 +0200)
pdns/recursordist/test-syncres_cc3.cc

index 715679a6c30f4ea200abfd9f13b706bbcd08625e..361016ce39da0eea117e42df4fd3dd4d0af513bb 100644 (file)
@@ -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);