Fix build script
[senf.git] / Scheduler / FdDispatcher.test.cc
index 62a6187..853d862 100644 (file)
@@ -28,7 +28,6 @@
 
 // Custom includes
 #include <sys/types.h>
-#include <signal.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/socket.h>
@@ -166,6 +165,7 @@ BOOST_AUTO_UNIT_TEST(fdDispatcher)
     senf::scheduler::FdManager manager;
     senf::scheduler::FIFORunner runner;
     senf::scheduler::FdDispatcher dispatcher (manager, runner);
+    manager.timeout(1000);
 
     int pid (start_server());
     BOOST_REQUIRE( pid );
@@ -185,9 +185,8 @@ BOOST_AUTO_UNIT_TEST(fdDispatcher)
         BOOST_FAIL("connect");
     }
 
-    SENF_CHECK_NO_THROW( dispatcher.add(sock, boost::bind(&callback, sock, _1),
-                                        senf::scheduler::FdDispatcher::EV_READ) );
-    manager.timeout(1000);
+    BOOST_CHECK( dispatcher.add("testHandler", sock, boost::bind(&callback, sock, _1),
+                                senf::scheduler::FdDispatcher::EV_READ) );
     event = 0;
     SENF_CHECK_NO_THROW( manager.processOnce() );
     SENF_CHECK_NO_THROW( runner.run() );
@@ -198,8 +197,8 @@ BOOST_AUTO_UNIT_TEST(fdDispatcher)
 
     strcpy(buffer,"WRITE");
     size=5;
-    SENF_CHECK_NO_THROW( dispatcher.add(sock, boost::bind(&callback, sock, _1),
-                                        senf::scheduler::FdDispatcher::EV_WRITE) );
+    BOOST_CHECK( dispatcher.add("testHandler", sock, boost::bind(&callback, sock, _1),
+                                senf::scheduler::FdDispatcher::EV_WRITE) );
     event = 0;
     sleep(1);
     SENF_CHECK_NO_THROW( manager.processOnce() );