From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 16 Jul 2019 12:05:12 +0000 (+0200)
Subject: Don't fail the test right away if we don't have the right number of FDs ready
X-Git-Tag: dnsdist-1.4.0-rc1~41^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F8087%2Fhead;p=thirdparty%2Fpdns.git

Don't fail the test right away if we don't have the right number of FDs ready

This way we can at least check that the callbacks are called later.
Also, since it looks like the read pipe is always reported as ready,
let's try to write first to see if it blocks.
---

diff --git a/pdns/test-mplexer.cc b/pdns/test-mplexer.cc
index b35c54d189..5a3269f559 100644
--- a/pdns/test-mplexer.cc
+++ b/pdns/test-mplexer.cc
@@ -130,22 +130,22 @@ BOOST_AUTO_TEST_CASE(test_MPlexer) {
     cerr<<"Watching "<<mplexer->getWatchedFDCount(false)<<" FDs for read and "<<mplexer->getWatchedFDCount(true)<<" for write"<<endl;
     cerr<<"pipes[0] is "<<pipes[0]<<endl;
     cerr<<"pipes[1] is "<<pipes[1]<<endl;
-    cerr<<"The file descripttor returned as ready is "<<readyFDs.at(0)<<endl;
+    cerr<<"The file descriptor returned as ready is "<<readyFDs.at(0)<<endl;
     char buffer[2];
-    ssize_t res = read(pipes[0], &buffer[0], sizeof(buffer));
+    ssize_t res = write(pipes[1], "0", 1);
     int saved = errno;
-    cerr<<"Reading from pipes[0] returns "<<res<<endl;
+    cerr<<"Writing to pipes[1] returns "<<res<<endl;
     if (res == -1) {
       cerr<<"errno is "<<saved<<endl;
     }
-    res = write(pipes[1], "0", 1);
+    res = read(pipes[0], &buffer[0], sizeof(buffer));
     saved = errno;
-    cerr<<"Writing to pipes[1] returns "<<res<<endl;
+    cerr<<"Reading from pipes[0] returns "<<res<<endl;
     if (res == -1) {
       cerr<<"errno is "<<saved<<endl;
     }
   }
-  BOOST_REQUIRE_EQUAL(readyFDs.size(), 2);
+  BOOST_CHECK_EQUAL(readyFDs.size(), 2);
 
   readCBCalled = false;
   writeCBCalled = false;