[5095] Re-enabled tests

diff --git a/src/bin/dhcp4/tests/hooks_unittest.cc b/src/bin/dhcp4/tests/hooks_unittest.cc
index 5bc82805fdbf52eb8db34532df50f008e17fa652..b57ba297401f09525c7fd645e92f81362cca5c04 100644 (file)
--- a/src/bin/dhcp4/tests/hooks_unittest.cc
+++ b/src/bin/dhcp4/tests/hooks_unittest.cc
@@ -1603,13 +1603,7 @@ TEST_F(HooksDhcpv4SrvTest, lease4ReleaseSkip) {
 }
 
 // Checks that decline4 hooks (lease4_decline) are triggered properly.
-/// @todo: There is a bug in HooksManager that causes the callouts installed
-/// using preCalloutsLibraryHandle() to be uninstalled when loadLibrary
-/// is called. This has changed recently (ticket #5031) as it calls the
-/// load/unload every time, regardless if the hooks-libraries clause is in the
-/// config file or not. #5095 has been submitted for this issue. Please
-/// enable this test once #5095 is fixed.
-TEST_F(HooksDhcpv4SrvTest, DISABLED_HooksDecline) {
+TEST_F(HooksDhcpv4SrvTest, HooksDecline) {
     IfaceMgrTestConfig test_config(true);
     IfaceMgr::instance().openSockets4();
 
@@ -1655,9 +1649,7 @@ TEST_F(HooksDhcpv4SrvTest, DISABLED_HooksDecline) {
 }
 
 // Checks that decline4 hook is able to drop the packet.
-/// @todo See HooksDhcpv4SrvTest.HooksDecline description for details.
-/// Please reenable this once #5095 is fixed.
-TEST_F(HooksDhcpv4SrvTest, DISABLED_HooksDeclineDrop) {
+TEST_F(HooksDhcpv4SrvTest, HooksDeclineDrop) {
     IfaceMgrTestConfig test_config(true);
     IfaceMgr::instance().openSockets4();
 

diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index 131af1fb654b67b62de8bd9aacf13345cce173ab..975fd797fcaef036f8d6006658ec0105ebb154ea 100644 (file)
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -2079,8 +2079,7 @@ TEST_F(HooksDhcpv6SrvTest, skipLease6Rebind) {
 
 // This test checks that the basic decline hook (lease6_decline) is
 // triggered properly.
-/// @todo: Reenable this once #5095 is fixed.
-TEST_F(HooksDhcpv6SrvTest, DISABLED_basicLease6Decline) {
+TEST_F(HooksDhcpv6SrvTest, basicLease6Decline) {
     IfaceMgrTestConfig test_config(true);
 
     // Install lease6_decline callout
@@ -2172,8 +2171,7 @@ TEST_F(HooksDhcpv6SrvTest, DISABLED_lease6DeclineSkip) {
 }
 
 // Test that the lease6_decline hook point can handle DROP status.
-/// @todo: Reenable this once #5095 is fixed.
-TEST_F(HooksDhcpv6SrvTest, DISABLED_lease6DeclineDrop) {
+TEST_F(HooksDhcpv6SrvTest, lease6DeclineDrop) {
     IfaceMgrTestConfig test_config(true);
 
     // Install lease6_decline callout. It will set the status to skip