X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.test.cc;h=f328d32ea255db648c59d25d0c5fd4a8d33154b4;hb=7bd56a99323c473e899afa26e0cb59d58abce163;hp=75bc76a6a11f74a792b5bb11ecae60b7114401f9;hpb=556aea04a82b3e2e5cdfe28a0abd3b275c7decf9;p=senf.git diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc index 75bc76a..f328d32 100644 --- a/Scheduler/Scheduler.test.cc +++ b/Scheduler/Scheduler.test.cc @@ -298,7 +298,7 @@ void schedulerTest() SENF_CHECK_NO_THROW( timer1.action(&blockingHandler) ); SENF_CHECK_NO_THROW( timer1.timeout(senf::ClockService::now()) ); SENF_CHECK_NO_THROW( senf::scheduler::process() ); - BOOST_CHECK_EQUAL( senf::scheduler::hangCount(), 1u ); + BOOST_CHECK_EQUAL( senf::scheduler::watchdogEvents(), 1u ); } { @@ -337,19 +337,19 @@ BOOST_AUTO_UNIT_TEST(testSchedulerHiresTimers) BOOST_MESSAGE( "Using timerfd() hires timers" ); else BOOST_MESSAGE( "Using POSIX hires timers"); - senf::scheduler::hiresTimers(); + SENF_CHECK_NO_THROW( senf::scheduler::hiresTimers() ); BOOST_CHECK( senf::scheduler::usingHiresTimers() ); schedulerTest(); - senf::scheduler::loresTimers(); + SENF_CHECK_NO_THROW( senf::scheduler::loresTimers() ); BOOST_CHECK( ! senf::scheduler::usingHiresTimers() ); } BOOST_AUTO_UNIT_TEST(testSchedulerPOSIXTimers) { if (senf::scheduler::haveScalableHiresTimers()) { - senf::scheduler::detail::TimerDispatcher::instance().timerSource( - std::auto_ptr( - new senf::scheduler::detail::POSIXTimerSource())); + SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().timerSource( + std::auto_ptr( + new senf::scheduler::detail::POSIXTimerSource())) ); schedulerTest(); senf::scheduler::loresTimers(); }