diff options
Diffstat (limited to 'messagebus/src/tests')
8 files changed, 13 insertions, 13 deletions
diff --git a/messagebus/src/tests/context/context.cpp b/messagebus/src/tests/context/context.cpp index de9dd1b83a6..c71357d09ad 100644 --- a/messagebus/src/tests/context/context.cpp +++ b/messagebus/src/tests/context/context.cpp @@ -77,7 +77,7 @@ Test::Main() if (queue.size() == 3) { break; } - FastOS_Thread::Sleep(10); + std::this_thread::sleep_for(10ms); } EXPECT_EQUAL(queue.size(), 3u); { diff --git a/messagebus/src/tests/loadbalance/loadbalance.cpp b/messagebus/src/tests/loadbalance/loadbalance.cpp index 2f510d98ff1..05ea6d78871 100644 --- a/messagebus/src/tests/loadbalance/loadbalance.cpp +++ b/messagebus/src/tests/loadbalance/loadbalance.cpp @@ -78,7 +78,7 @@ Test::Main() if (queue.size() == msgCnt) { break; } - FastOS_Thread::Sleep(10); + std::this_thread::sleep_for(10ms); } EXPECT_TRUE(queue.size() == msgCnt); EXPECT_TRUE(h1.cnt == msgCnt / 3); diff --git a/messagebus/src/tests/messagebus/messagebus.cpp b/messagebus/src/tests/messagebus/messagebus.cpp index 7434941a900..d9c6e438523 100644 --- a/messagebus/src/tests/messagebus/messagebus.cpp +++ b/messagebus/src/tests/messagebus/messagebus.cpp @@ -43,7 +43,7 @@ struct Base { if (queue.size() == size) { return true; } - FastOS_Thread::Sleep(10); + std::this_thread::sleep_for(10ms); } return false; } @@ -270,7 +270,7 @@ Test::testSendToCol() } } client->waitQueueSize(300); - FastOS_Thread::Sleep(100); + std::this_thread::sleep_for(100ms); client->waitQueueSize(300); while (client->queue.size() > 0) { Routable::UP reply = client->queue.dequeue(0); @@ -347,7 +347,7 @@ Test::testSendToAnyThenCol() } } client->waitQueueSize(300); - FastOS_Thread::Sleep(100); + std::this_thread::sleep_for(100ms); client->waitQueueSize(300); while (client->queue.size() > 0) { Routable::UP reply = client->queue.dequeue(0); diff --git a/messagebus/src/tests/messageordering/messageordering.cpp b/messagebus/src/tests/messageordering/messageordering.cpp index 520c3d3dea3..481b8bbd270 100644 --- a/messagebus/src/tests/messageordering/messageordering.cpp +++ b/messagebus/src/tests/messageordering/messageordering.cpp @@ -167,7 +167,7 @@ Test::Main() const int messageCount = 5000; for (int i = 0; i < messageCount; ++i) { vespalib::string str(vespalib::make_string("%d", i)); - //FastOS_Thread::Sleep(1); + //std::this_thread::sleep_for(1ms); auto msg = std::make_unique<SimpleMessage>(str, true, commonMessageId); msg->getTrace().setLevel(9); //LOG(debug, "Sending message %p for %d", msg.get(), i); diff --git a/messagebus/src/tests/serviceaddress/serviceaddress.cpp b/messagebus/src/tests/serviceaddress/serviceaddress.cpp index ac43cec3c02..441da5a80ac 100644 --- a/messagebus/src/tests/serviceaddress/serviceaddress.cpp +++ b/messagebus/src/tests/serviceaddress/serviceaddress.cpp @@ -82,7 +82,7 @@ Test::waitSlobrok(RPCNetwork &network, const string &pattern, size_t num) if (res.size() == num) { return true; } - FastOS_Thread::Sleep(10); + std::this_thread::sleep_for(10ms); } return false; } diff --git a/messagebus/src/tests/slobrok/slobrok.cpp b/messagebus/src/tests/slobrok/slobrok.cpp index 7e0718283a6..439ee0b23b5 100644 --- a/messagebus/src/tests/slobrok/slobrok.cpp +++ b/messagebus/src/tests/slobrok/slobrok.cpp @@ -51,7 +51,7 @@ compare(const IMirrorAPI &api, const string &pattern, SpecList expect) if (actual == expect) { return true; } - FastOS_Thread::Sleep(100); + std::this_thread::sleep_for(100ms); } return false; } diff --git a/messagebus/src/tests/sourcesession/sourcesession.cpp b/messagebus/src/tests/sourcesession/sourcesession.cpp index 5177cf0e799..de04715a060 100644 --- a/messagebus/src/tests/sourcesession/sourcesession.cpp +++ b/messagebus/src/tests/sourcesession/sourcesession.cpp @@ -35,7 +35,7 @@ struct DelayedHandler : public IMessageHandler // this will block the transport thread in the server messagebus, // but that should be ok, as we only want to test the timing in the // client messagebus... - FastOS_Thread::Sleep(delay); + std::this_thread::sleep_for(std::chrono::milliseconds(delay)); session->acknowledge(std::move(msg)); } }; @@ -59,7 +59,7 @@ bool waitQueueSize(RoutableQueue &queue, uint32_t size) { if (queue.size() == size) { return true; } - FastOS_Thread::Sleep(1); + std::this_thread::sleep_for(1ms); } return false; } @@ -99,7 +99,7 @@ Test::testSequencing() EXPECT_TRUE(ss->send(Message::UP(new SimpleMessage("foo", true, 2)), "dst").isAccepted()); EXPECT_TRUE(ss->send(Message::UP(new SimpleMessage("foo", true, 1)), "dst").isAccepted()); EXPECT_TRUE(waitQueueSize(dstQ, 2)); - FastOS_Thread::Sleep(250); + std::this_thread::sleep_for(250ms); EXPECT_TRUE(waitQueueSize(dstQ, 2)); EXPECT_TRUE(waitQueueSize(srcQ, 0)); ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release())); diff --git a/messagebus/src/tests/throttling/throttling.cpp b/messagebus/src/tests/throttling/throttling.cpp index 5d3525e8ba6..76bba89b72d 100644 --- a/messagebus/src/tests/throttling/throttling.cpp +++ b/messagebus/src/tests/throttling/throttling.cpp @@ -51,7 +51,7 @@ bool waitQueueSize(RoutableQueue &queue, uint32_t size) if (queue.size() == size) { return true; } - FastOS_Thread::Sleep(10); + std::this_thread::sleep_for(10ms); } return false; } @@ -62,7 +62,7 @@ bool waitPending(SourceSession& session, uint32_t size) if (session.getPendingCount() == size) { return true; } - FastOS_Thread::Sleep(1); + std::this_thread::sleep_for(1ms); } return false; } |