BIND 10 trac2995, updated. c6b3ce6d16f92b80db77487900fb57a7a67b3203 [2995] Dhcpv4Srv tests are now passing again.

[BIND 10 source code commits]

The branch, trac2995 has been updated
       via  c6b3ce6d16f92b80db77487900fb57a7a67b3203 (commit)
      from  9785efa0afab6667a61d322f9a3a3dee048dd0dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c6b3ce6d16f92b80db77487900fb57a7a67b3203
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Thu Jun 27 14:15:37 2013 +0200

    [2995] Dhcpv4Srv tests are now passing again.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/dhcp4/tests/dhcp4_srv_unittest.cc |    9 +++++++++
 src/bin/dhcp6/tests/dhcp6_srv_unittest.cc |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index c39c56a..0785757 100644
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -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:
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 277b749..b40122d 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -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