From 80f589eff410c6e58b190fab67859236e159a578 Mon Sep 17 00:00:00 2001 From: g0dil <g0dil@wiback.org> Date: Tue, 3 Feb 2009 16:21:37 +0000 Subject: [PATCH] Scheduler: Fix TimerEvent unit test reliability --- Scheduler/TimerEvent.test.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Scheduler/TimerEvent.test.cc b/Scheduler/TimerEvent.test.cc index cbab9f6c2..e4f2b9805 100644 --- a/Scheduler/TimerEvent.test.cc +++ b/Scheduler/TimerEvent.test.cc @@ -28,6 +28,7 @@ // Custom includes #include "TimerEvent.hh" +#include "Scheduler.hh" #include "../Utils//auto_unit_test.hh" #include <boost/test/test_tools.hpp> @@ -61,12 +62,7 @@ BOOST_AUTO_UNIT_TEST(timerDispatcher) SENF_CHECK_NO_THROW( timer.disable() ); SENF_CHECK_NO_THROW( timer.enable() ); BOOST_CHECK( timer.enabled() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().enable() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().reschedule() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::FdManager::instance().processOnce() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().prepareRun() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::FIFORunner::instance().run() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().disable() ); + SENF_CHECK_NO_THROW( senf::scheduler::process() ); senf::ClockService::clock_type t2 (senf::ClockService::now()); BOOST_CHECK( called ); BOOST_CHECK( ! timer.enabled() ); -- GitLab