[#1442] Fixed D2 client queue

diff --git a/src/bin/dhcp4/tests/d2_unittest.cc b/src/bin/dhcp4/tests/d2_unittest.cc
index 0f2d49503344aa6d2e5d100f62d9d76038ef2d76..0a11144fd4a747874d7864049722d91960f98f66 100644 (file)
--- a/src/bin/dhcp4/tests/d2_unittest.cc
+++ b/src/bin/dhcp4/tests/d2_unittest.cc
@@ -274,6 +274,8 @@ TEST_F(Dhcp4SrvD2Test, simpleUDPSend) {
     // Configure it enabled and start it.
     ASSERT_NO_FATAL_FAILURE(configureD2(true));
     ASSERT_TRUE(mgr.ddnsEnabled());
+    ASSERT_NO_THROW(mgr.clearQueue());
+    EXPECT_EQ(0, mgr.getQueueSize());
     ASSERT_NO_THROW(srv_.startD2());
     ASSERT_TRUE(mgr.amSending());
 
@@ -313,6 +315,8 @@ TEST_F(Dhcp4SrvD2Test, DISABLED_forceUDPSendFailure) {
     ASSERT_NO_FATAL_FAILURE(configureD2(true, SHOULD_PASS, "0.0.0.0", 0,
                                         "0.0.0.0", 53001));
     ASSERT_TRUE(mgr.ddnsEnabled());
+    ASSERT_NO_THROW(mgr.clearQueue());
+    EXPECT_EQ(0, mgr.getQueueSize());
     try {
         srv_.startD2();
     } catch (const std::exception& ex) {
@@ -374,6 +378,8 @@ TEST_F(Dhcp4SrvD2Test, queueMaxError) {
     dhcp::D2ClientMgr& mgr = CfgMgr::instance().getD2ClientMgr();
     ASSERT_NO_FATAL_FAILURE(configureD2(true));
     ASSERT_TRUE(mgr.ddnsEnabled());
+    ASSERT_NO_THROW(mgr.clearQueue());
+    EXPECT_EQ(0, mgr.getQueueSize());
     ASSERT_NO_THROW(srv_.startD2());
     ASSERT_TRUE(mgr.amSending());
 

diff --git a/src/bin/dhcp6/tests/d2_unittest.cc b/src/bin/dhcp6/tests/d2_unittest.cc
index f54f3fc332c4aa7f3bee8da1bac61f37dc1b6ff4..ef58d21d5a053dfb275b4ebc9afa493c58567c46 100644 (file)
--- a/src/bin/dhcp6/tests/d2_unittest.cc
+++ b/src/bin/dhcp6/tests/d2_unittest.cc
@@ -279,6 +279,8 @@ TEST_F(Dhcp6SrvD2Test, simpleUDPSend) {
     // Configure it enabled and start it.
     ASSERT_NO_FATAL_FAILURE(configureD2(true));
     ASSERT_TRUE(mgr.ddnsEnabled());
+    ASSERT_NO_THROW(mgr.clearQueue());
+    EXPECT_EQ(0, mgr.getQueueSize());
     ASSERT_NO_THROW(srv_.startD2());
     ASSERT_TRUE(mgr.amSending());
 
@@ -318,6 +320,8 @@ TEST_F(Dhcp6SrvD2Test, DISABLED_forceUDPSendFailure) {
     ASSERT_NO_FATAL_FAILURE(configureD2(true, SHOULD_PASS, "::", 0,
                                         "::", 53001));
     ASSERT_TRUE(mgr.ddnsEnabled());
+    ASSERT_NO_THROW(mgr.clearQueue());
+    EXPECT_EQ(0, mgr.getQueueSize());
     try {
         srv_.startD2();
     } catch (const std::exception& ex) {
@@ -379,6 +383,8 @@ TEST_F(Dhcp6SrvD2Test, queueMaxError) {
     dhcp::D2ClientMgr& mgr = CfgMgr::instance().getD2ClientMgr();
     ASSERT_NO_FATAL_FAILURE(configureD2(true));
     ASSERT_TRUE(mgr.ddnsEnabled());
+    ASSERT_NO_THROW(mgr.clearQueue());
+    EXPECT_EQ(0, mgr.getQueueSize());
     ASSERT_NO_THROW(srv_.startD2());
     ASSERT_TRUE(mgr.amSending());