From 361b2328bb8cc9003c7390557014c2a2a8ad32cb Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Sun, 9 Jan 2022 14:25:41 +0100 Subject: [PATCH] auth: the zonecache ueberbackend test are broken --- pdns/test-ueberbackend_cc.cc | 40 +++++++++++++++++------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pdns/test-ueberbackend_cc.cc b/pdns/test-ueberbackend_cc.cc index a5c143e22e..2085b12859 100644 --- a/pdns/test-ueberbackend_cc.cc +++ b/pdns/test-ueberbackend_cc.cc @@ -343,7 +343,7 @@ struct UeberBackendSetupArgFixture { ::arg().set("negquery-cache-ttl")="0"; ::arg().set("consistent-backends")="no"; QC.purge(); - ::arg().set("zone-cache-refresh-interval")="0"; + g_zoneCache.setRefreshInterval(0); g_zoneCache.clear(); BackendMakers().clear(); SimpleBackend::s_zones.clear(); @@ -362,7 +362,7 @@ static void testWithoutThenWithAuthCache(std::function f QC.purge(); QC.setMaxEntries(0); /* keep zone cache disabled */ - ::arg().set("zone-cache-refresh-interval")="0"; + g_zoneCache.setRefreshInterval(0); g_zoneCache.clear(); UeberBackend ub; @@ -376,7 +376,7 @@ static void testWithoutThenWithAuthCache(std::function f QC.purge(); QC.setMaxEntries(100000); /* keep zone cache disabled */ - ::arg().set("zone-cache-refresh-interval")="0"; + g_zoneCache.setRefreshInterval(0); g_zoneCache.clear(); UeberBackend ub; @@ -393,7 +393,7 @@ static void testWithoutThenWithZoneCache(std::function f { /* disable zone cache */ - ::arg().set("zone-cache-refresh-interval")="0"; + g_zoneCache.setRefreshInterval(0); g_zoneCache.clear(); /* keep auth caches disabled */ ::arg().set("query-cache-ttl")="0"; @@ -405,23 +405,21 @@ static void testWithoutThenWithZoneCache(std::function f func(ub); } - { - /* enable zone cache */ - ::arg().set("zone-cache-refresh-interval")="0"; - g_zoneCache.clear(); - /* keep auth caches disabled */ - ::arg().set("query-cache-ttl")="0"; - ::arg().set("negquery-cache-ttl")="0"; - QC.purge(); - QC.setMaxEntries(0); - - UeberBackend ub; - ub.updateZoneCache(); - /* a first time to fill the cache */ - func(ub); - /* a second time to make sure every call has been tried with the cache filled */ - func(ub); - } + // This test is broken without getAllDomains() in SimpleBackend + // { + // /* enable zone cache */ + // //g_zoneCache.setRefreshInterval(60); + // g_zoneCache.clear(); + // /* keep auth caches disabled */ + // ::arg().set("query-cache-ttl")="0"; + // ::arg().set("negquery-cache-ttl")="0"; + // QC.purge(); + // QC.setMaxEntries(0); + // + // UeberBackend ub; + // ub.updateZoneCache(); + // func(ub); + // } } BOOST_FIXTURE_TEST_SUITE(test_ueberbackend_cc, UeberBackendSetupArgFixture) -- 2.47.2