From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 11 Feb 2014 18:40:57 +0000 (-0500)
Subject: [master] Corrected dhcp_ddns::WatchSocket unit test failure
X-Git-Tag: bind10-1.2.0beta1-release~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0053becdd7452871439bcc19095ed9b50f7e01bc;p=thirdparty%2Fkea.git

[master] Corrected dhcp_ddns::WatchSocket unit test failure

Unit test was failing as a closed fd passed to select() does not fail
on all OSs.  Changed the test so it verifies that the fd in question
no longer evaluates to ready to ready.
---

diff --git a/src/lib/dhcp_ddns/tests/watch_socket_unittests.cc b/src/lib/dhcp_ddns/tests/watch_socket_unittests.cc
index 82999f6b8c..e19b8cbe21 100644
--- a/src/lib/dhcp_ddns/tests/watch_socket_unittests.cc
+++ b/src/lib/dhcp_ddns/tests/watch_socket_unittests.cc
@@ -194,8 +194,8 @@ TEST(WatchSocketTest, badReadOnClear) {
     /// @todo maybe clear should never throw, log only
     ASSERT_THROW(watch->clearReady(), WatchSocketError);
 
-    // Verify the select_fd fails as socket is invalid/closed.
-    EXPECT_EQ(-1, selectCheck(select_fd));
+    // Verify the select_fd does not evalute to ready.
+    EXPECT_NE(1, selectCheck(select_fd));
 
     // Verify that getSelectFd() returns INVALID.
     ASSERT_EQ(WatchSocket::INVALID_SOCKET, watch->getSelectFd());