diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-05 05:32:02 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-05 05:32:02 -0800 |
commit | 15d09c5b5a02bd3c7cf859401e4a613edeebd901 (patch) | |
tree | 440e04af619d9f83279fd593ca272dba772ddb5e /documentapi/src/tests/policies | |
parent | 17a8ab2b1d0600e9651b1aa0748edba8f48707bf (diff) | |
parent | 1cfdd7f98bf1a33e7edc6cfb646ee53d5654c7f4 (diff) |
Merge branch 'master' into balder/use-duration-in-messagebus-and-storageapi-rebased-1
Diffstat (limited to 'documentapi/src/tests/policies')
-rw-r--r-- | documentapi/src/tests/policies/policies_test.cpp | 4 | ||||
-rw-r--r-- | documentapi/src/tests/policies/testframe.cpp | 4 |
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; |