X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.test.cc;h=8d6a53f1c3a1158ce517aba25052943a1cb63afc;hb=054f407988120bf96b648ad61068073e22db4f00;hp=a46aa18da2e44aaa36523d2219c4a0378d326763;hpb=c7ddbbb0bc014bdfe6daef91e2d1c512d77e9fff;p=senf.git diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc index a46aa18..8d6a53f 100644 --- a/Scheduler/Scheduler.test.cc +++ b/Scheduler/Scheduler.test.cc @@ -1,4 +1,3 @@ - // $Id$ // // Copyright (C) 2006 @@ -102,6 +101,7 @@ namespace { unlink(SOCK_PATH); int pid = fork(); if (pid == 0) { + signal(SIGCHLD, SIG_IGN); server(); _exit(0); } @@ -109,6 +109,7 @@ namespace { error("fork"); return 0; } + signal(SIGCHLD, SIG_DFL); sleep(1); // Wait for the server socket to be opened return pid; @@ -242,8 +243,8 @@ BOOST_AUTO_UNIT_TEST(testScheduler) /////////////////////////////////////////////////////////////////////////// - senf::scheduler::EventEvent evev ("eventCounter", eventeventhandler, true, - senf::scheduler::EventEvent::PRIORITY_HIGH); + senf::scheduler::EventHook evev ("eventCounter", eventeventhandler, true, + senf::scheduler::EventHook::PRE); { senf::scheduler::FdEvent fde1 ("testFdEvent", boost::bind(&callback, sock, _1), @@ -316,7 +317,7 @@ BOOST_AUTO_UNIT_TEST(testScheduler) BOOST_CHECK_NO_THROW( senf::scheduler::process() ); } - BOOST_CHECK_EQUAL( eventCount, 8u ); + BOOST_CHECK( eventCount >= 8u ); ///////////////////////////////////////////////////////////////////////////