aboutsummaryrefslogtreecommitdiffstats
path: root/config/src/tests/configretriever/configretriever.cpp
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/configretriever/configretriever.cpp
parent6b4486254e67b61e7dbe7dab30ae50d3b0bf01bb (diff)
WipeHistory has not been used for a very long time.
Diffstat (limited to 'config/src/tests/configretriever/configretriever.cpp')
-rw-r--r--config/src/tests/configretriever/configretriever.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/config/src/tests/configretriever/configretriever.cpp b/config/src/tests/configretriever/configretriever.cpp
index 87f189ad7d3..756ee815d56 100644
--- a/config/src/tests/configretriever/configretriever.cpp
+++ b/config/src/tests/configretriever/configretriever.cpp
@@ -245,9 +245,9 @@ public:
snap = snapshot;
configured = true;
}
- bool waitUntilConfigured(int64_t timeoutInMillis) {
- fastos::StopWatch timer;
- while (timer.elapsed().ms() < timeoutInMillis) {
+ bool waitUntilConfigured(vespalib::duration timeout) {
+ vespalib::Timer timer;
+ while (timer.elapsed() < timeout) {
if (configured) {
return true;
}
@@ -296,7 +296,7 @@ TEST_F("require that SimpleConfigurer usage works", ConfigurableFixture()) {
f1.configured = false;
fooBuilder.fooValue = "bimz";
ctx->reload();
- ASSERT_TRUE(f1.waitUntilConfigured(60000));
+ ASSERT_TRUE(f1.waitUntilConfigured(60s));
snap = f1.snap;
foo = snap.getConfig<FooConfig>("id");
ASSERT_EQUAL("bimz", foo->fooValue);
@@ -304,7 +304,7 @@ TEST_F("require that SimpleConfigurer usage works", ConfigurableFixture()) {
fooBuilder.fooValue = "bamz";
f1.configured = false;
ctx->reload();
- ASSERT_FALSE(f1.waitUntilConfigured(2000));
+ ASSERT_FALSE(f1.waitUntilConfigured(2s));
SimpleConfigurer configurer2(SimpleConfigRetriever::UP(new SimpleConfigRetriever(sub, ctx)), &f1);
f1.throwException = true;