summaryrefslogtreecommitdiffstats
path: root/config/src/tests/subscription
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-08 20:11:13 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-16 23:48:46 +0000
commitc72bdc628b4493bfb2974ab3fe479d2af0d376f1 (patch)
treece2f82f3f6f7cfd6ece7ac9ae06edef92986432f /config/src/tests/subscription
parent6b4486254e67b61e7dbe7dab30ae50d3b0bf01bb (diff)
WipeHistory has not been used for a very long time.
Diffstat (limited to 'config/src/tests/subscription')
-rw-r--r--config/src/tests/subscription/subscription.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/src/tests/subscription/subscription.cpp b/config/src/tests/subscription/subscription.cpp
index 5b8fc22bf4e..90dc678ecb7 100644
--- a/config/src/tests/subscription/subscription.cpp
+++ b/config/src/tests/subscription/subscription.cpp
@@ -66,18 +66,18 @@ TEST_F("requireThatNextUpdateBlocks", SubscriptionFixture(ConfigKey::create<MyCo
{
ASSERT_FALSE(f1.sub.nextUpdate(0, 0ms));
f1.holder->handle(std::make_unique<ConfigUpdate>(ConfigValue(), 1, 1));
- fastos::StopWatch timer;
+ vespalib::Timer timer;
ASSERT_FALSE(f1.sub.nextUpdate(1, 500ms));
- ASSERT_TRUE(timer.elapsed().ms() > 400.0);
+ ASSERT_TRUE(timer.elapsed() > 400ms);
}
TEST_MT_F("requireThatNextUpdateReturnsWhenNotified", 2, SubscriptionFixture(ConfigKey::create<MyConfig>("myid")))
{
if (thread_id == 0) {
- fastos::StopWatch timer;
+ vespalib::Timer timer;
f1.holder->handle(std::make_unique<ConfigUpdate>(ConfigValue(), 1, 1));
ASSERT_TRUE(f1.sub.nextUpdate(2, 5000ms));
- ASSERT_TRUE(timer.elapsed().ms() > 200.0);
+ ASSERT_TRUE(timer.elapsed() > 200ms);
} else {
std::this_thread::sleep_for(std::chrono::milliseconds(500));
f1.holder->handle(std::make_unique<ConfigUpdate>(ConfigValue(), 1, 1));
@@ -88,10 +88,10 @@ TEST_MT_F("requireThatNextUpdateReturnsWhenNotified", 2, SubscriptionFixture(Con
TEST_MT_F("requireThatNextUpdateReturnsInterrupted", 2, SubscriptionFixture(ConfigKey::create<MyConfig>("myid")))
{
if (thread_id == 0) {
- fastos::StopWatch timer;
+ vespalib::Timer timer;
f1.holder->handle(std::make_unique<ConfigUpdate>(ConfigValue(), 1, 1));
ASSERT_TRUE(f1.sub.nextUpdate(1, 5000ms));
- ASSERT_TRUE(timer.elapsed().ms() > 300.0);
+ ASSERT_TRUE(timer.elapsed() > 300ms);
} else {
std::this_thread::sleep_for(std::chrono::milliseconds(500));
f1.sub.close();