1 files changed, 13 insertions, 4 deletions
diff --git a/vespalog/src/test/bufferedlogskiptest.cpp b/vespalog/src/test/bufferedlogskiptest.cpp
index 8b7f1982678..abb5705b612 100644
--- a/vespalog/src/test/bufferedlogskiptest.cpp
+++ b/vespalog/src/test/bufferedlogskiptest.cpp
@@ -9,6 +9,15 @@
 
 LOG_SETUP("bufferedlogskiptest");
 
+using namespace std::literals::chrono_literals;
+
+/** Test timer returning just a given time. Used in tests to fake time. */
+struct TestTimer : public ns_log::Timer {
+    uint64_t & _time;
+    TestTimer(uint64_t & timeVar) : _time(timeVar) { }
+    ns_log::system_time getTimestamp() const override { return ns_log::system_time(std::chrono::microseconds(_time)); }
+};
+
 std::string readFile(const std::string& file) {
     std::ostringstream ost;
     std::ifstream is(file.c_str());
@@ -62,8 +71,8 @@ void testSkipBufferOnDebug(const std::string& file, uint64_t & timer)
 void reset(uint64_t & timer) {
     timer = 0;
     ns_log::BufferedLogger::instance().setMaxCacheSize(10);
-    ns_log::BufferedLogger::instance().setMaxEntryAge(300);
-    ns_log::BufferedLogger::instance().setCountFactor(5);
+    ns_log::BufferedLogger::instance().setMaxEntryAge(300s);
+    ns_log::BufferedLogger::instance().setCountFactor(5s);
 }
 
 int
@@ -75,8 +84,8 @@ main(int argc, char **argv)
     }
     ns_log::Logger::fakePid = true;
     uint64_t timer;
-    ns_log_logger.setTimer(std::unique_ptr<ns_log::Timer>(new ns_log::TestTimer(timer)));
-    ns_log::BufferedLogger::instance().setTimer(std::unique_ptr<ns_log::Timer>(new ns_log::TestTimer(timer)));
+    ns_log_logger.setTimer(std::make_unique<TestTimer>(timer));
+    ns_log::BufferedLogger::instance().setTimer(std::make_unique<TestTimer>(timer));
 
     reset(timer);
     testSkipBufferOnDebug(argv[1], timer);