X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FClockService.test.cc;h=e6bb0c9414136e705da6ad481e1bce966290186a;hb=14daa84b7c821626ae098bedd93ef07d98bf3a40;hp=88c68e9658f20cb2592a6ad8a2b6d52f003bca94;hpb=4ec38ecb3c79f853e9ebc92e30735e6fc62ac0c9;p=senf.git

diff --git a/Scheduler/ClockService.test.cc b/Scheduler/ClockService.test.cc
index 88c68e9..e6bb0c9 100644
--- a/Scheduler/ClockService.test.cc
+++ b/Scheduler/ClockService.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include "ClockService.hh"
 #include <errno.h>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -52,13 +52,13 @@ namespace detail {
 namespace {
 
     bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b, 
-                        unsigned long delta = 50000000ul)
+                        unsigned long delta = senf::ClockService::milliseconds(100))
     {
         return (a<b ? b-a : a-b ) < delta;
     }
 
     bool is_close_pt(boost::posix_time::ptime a, boost::posix_time::ptime b,
-                     boost::posix_time::time_duration delta = boost::posix_time::milliseconds(50) )
+                     boost::posix_time::time_duration delta = boost::posix_time::milliseconds(100) )
     {
         return (a<b ? b-a : a-b ) < delta;
     }
@@ -105,7 +105,8 @@ BOOST_AUTO_UNIT_TEST(clockService)
     t2 = senf::ClockService::now();
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (t1 + senf::ClockService::seconds(senf::ClockService::CheckInterval))
-                           (t2) );
+                           (t2)
+                           (senf::ClockService::milliseconds(500)) );
 
     t1 = t2;
 
@@ -117,10 +118,13 @@ BOOST_AUTO_UNIT_TEST(clockService)
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (t1 + senf::ClockService::milliseconds(200))
                            (senf::ClockService::now()) );
-    
-    // We need restart the clock-service here to fix up the bad heartbeat value. That's faster
-    // than waiting another CheckInterval seconds for SIGALRM
-    senf::ClockService::restart();
+
+    // The next check validates that the clock service itimer/heartbeat_ is correctly reset after a
+    // clock-skew is detected
+
+    BOOST_CHECK_PREDICATE( is_close_clock,
+                           (t1 + senf::ClockService::milliseconds(200))
+                           (senf::ClockService::now()) );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////