Merge branch 'master' into balder/use-duration-in-messagebus-and-storageapi-rebased-1

2 files changed, 5 insertions, 3 deletions

diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index 3dbc9dd7e69..0f0b9bd4504 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -286,7 +286,7 @@ Test::assertMirrorReady(const slobrok::api::IMirrorAPI &mirror)
         if (mirror.ready()) {
             return;
         }
-        FastOS_Thread::Sleep(10);
+        std::this_thread::sleep_for(10ms);
     }
     ASSERT_TRUE(false);
 }
@@ -299,7 +299,7 @@ Test::assertMirrorContains(const slobrok::api::IMirrorAPI &mirror, const string
         if (mirror.lookup(pattern).size() == numEntries) {
             return;
         }
-        FastOS_Thread::Sleep(10);
+        std::this_thread::sleep_for(10ms);
     }
     ASSERT_TRUE(false);
 }
diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp
index 9834e534a56..585885b7c4b 100644
--- a/documentapi/src/tests/policies/testframe.cpp
+++ b/documentapi/src/tests/policies/testframe.cpp
@@ -8,6 +8,8 @@
 #include <vespa/messagebus/testlib/simpleprotocol.h>
 #include <vespa/messagebus/testlib/simplereply.h>
 #include <vespa/messagebus/network/rpcnetworkparams.h>
+#include <vespa/vespalib/util/time.h>
+#include <thread>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".testframe");
@@ -297,7 +299,7 @@ TestFrame::waitSlobrok(const string &pattern, uint32_t cnt)
         if (res.size() == cnt) {
             return true;
         }
-        FastOS_Thread::Sleep(10);
+        std::this_thread::sleep_for(10ms);
     }
     LOG(error, "Slobrok failed to resolve '%s' to %d recipients in time.", pattern.c_str(), cnt);
     return false;