Qname minimizaton.

[thirdparty/pdns.git] / pdns / recursordist / test-syncres_cc3.cc

diff --git a/pdns/recursordist/test-syncres_cc3.cc b/pdns/recursordist/test-syncres_cc3.cc
index 715679a6c30f4ea200abfd9f13b706bbcd08625e..9a5ea155e5eede11eda63be8caf1e3df4e6d9a26 100644 (file)
--- a/pdns/recursordist/test-syncres_cc3.cc
+++ b/pdns/recursordist/test-syncres_cc3.cc
@@ -112,7 +112,7 @@ static void test_no_data_f(bool qmin) {
   std::unique_ptr<SyncRes> sr;
   initSR(sr);
   if (qmin)
-    setDoQNameMinimisation();
+    sr->setQNameMinimization();
 
   primeHints();
 
@@ -138,8 +138,6 @@ BOOST_AUTO_TEST_CASE(test_no_data) {
 }
 
 BOOST_AUTO_TEST_CASE(test_no_data_qmin) {
-  // DISABLED UNTIL QNAME MINIMIZATION IS THERE
-  return;
   test_no_data_f(true);
 }
 
@@ -513,6 +511,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 +553,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 +596,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 +640,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);