Commit c6b3ce6d authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[2995] Dhcpv4Srv tests are now passing again.

parent 9785efa0
......@@ -26,6 +26,7 @@
#include <dhcp/pkt_filter_inet.h>
#include <dhcp4/dhcp4_srv.h>
#include <dhcp4/dhcp4_log.h>
#include <hooks/server_hooks.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/lease_mgr.h>
#include <dhcpsrv/lease_mgr_factory.h>
......@@ -155,6 +156,14 @@ public:
unlink(SRVID_FILE);
}
virtual ~Dhcpv4SrvTest() {
// Remove all registered hook points (it must be done even for tests that
// do not use hooks as the base class - Dhcpv4Srv calls allocation engine
// that registers hooks)
isc::hooks::ServerHooks::getServerHooks().reset();
}
/// @brief Add 'Parameter Request List' option to the packet.
///
/// This function PRL option comprising the following option codes:
......
......@@ -111,7 +111,7 @@ public:
virtual ~NakedDhcpv6Srv() {
// Remove all registered hook points (it must be done even for tests that
// do not use hooks as the base class - Dhcpv6Srv registers hooks
// do not use hooks as the base class - Dhcpv6Srv registers hooks)
ServerHooks::getServerHooks().reset();
// Close the lease database
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment