Let the InvocationService drive the clock instead of having its own ticking loop.

Also use sleep_until to get intervals indendant of invoke cost as long as cost is within interval.
This also also saves a clock sample and simplifies implementation.

1 files changed, 1 insertions, 9 deletions

diff --git a/staging_vespalib/src/tests/clock/clock_test.cpp b/staging_vespalib/src/tests/clock/clock_test.cpp
index 2c6cbc0c876..b8ee4d7cc64 100644
--- a/staging_vespalib/src/tests/clock/clock_test.cpp
+++ b/staging_vespalib/src/tests/clock/clock_test.cpp
@@ -19,19 +19,11 @@ void waitForMovement(steady_time start, Clock & clock, vespalib::duration timeou
 
 TEST("Test that clock is ticking forward") {
     vespalib::InvokeServiceImpl invoker(50ms);
-    Clock clock;
-    clock.start(invoker);
+    Clock clock(invoker.nowPtr());
     steady_time start = clock.getTimeNS();
     waitForMovement(start, clock, 10s);
     steady_time stop = clock.getTimeNS();
     EXPECT_TRUE(stop > start);
-    std::this_thread::sleep_for(1s);
-    start = clock.getTimeNS();
-    waitForMovement(start, clock, 10s);
-    clock.stop();
-    steady_time stop2 = clock.getTimeNS();
-    EXPECT_TRUE(stop2 > stop);
-    EXPECT_TRUE(vespalib::count_ms(stop2 - stop) > 1000);
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
\ No newline at end of file