From b8e151a435ccec1ecc03d98bac5b59f4f14514be Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 3 Dec 2019 21:45:53 +0000 Subject: timeout as duration Conflicts: messagebus/src/vespa/messagebus/testlib/testserver.cpp --- documentapi/src/tests/policies/policies_test.cpp | 52 +++++++++++----------- documentapi/src/tests/policies/testframe.cpp | 4 +- .../src/tests/policyfactory/policyfactory.cpp | 6 ++- .../src/tests/routablefactory/routablefactory.cpp | 34 +++++++------- 4 files changed, 51 insertions(+), 45 deletions(-) (limited to 'documentapi/src') diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 93c5d51fef5..3dbc9dd7e69 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -92,8 +92,10 @@ public: TEST_APPHOOK(Test); -Test::Test() {} -Test::~Test() {} +Test::Test() = default; +Test::~Test() = default; + +const vespalib::duration TIMEOUT = 600s; int Test::Main() { @@ -230,7 +232,7 @@ Test::requireThatExternPolicySelectsFromExternSlobrok() lst.insert(leaf[0]->getRoute().toString()); leaf[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(frame.getReceptor().getReply(600)); + ASSERT_TRUE(frame.getReceptor().getReply(TIMEOUT)); } EXPECT_EQUAL(servers.size(), lst.size()); for (uint32_t i = 0; i < servers.size(); ++i) { @@ -332,14 +334,14 @@ Test::testExternSend() msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:tcp/localhost:%d;itr/session] default", slobrok.port()))); ASSERT_TRUE(ss->send(std::move(msg)).isAccepted()); - ASSERT_TRUE((msg = ir.getMessage(600))); + ASSERT_TRUE((msg = ir.getMessage(TIMEOUT))); is->forward(std::move(msg)); - ASSERT_TRUE((msg = dr.getMessage(600))); + ASSERT_TRUE((msg = dr.getMessage(TIMEOUT))); ds->acknowledge(std::move(msg)); - mbus::Reply::UP reply = ir.getReply(600); + mbus::Reply::UP reply = ir.getReply(TIMEOUT); ASSERT_TRUE(reply); is->forward(std::move(reply)); - ASSERT_TRUE((reply = sr.getReply(600))); + ASSERT_TRUE((reply = sr.getReply(TIMEOUT))); fprintf(stderr, "%s", reply->getTrace().toString().c_str()); } @@ -366,9 +368,9 @@ Test::testExternMultipleSlobroks() mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0)); msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:%s;dst/session]", spec.c_str()))); ASSERT_TRUE(ss->send(std::move(msg)).isAccepted()); - ASSERT_TRUE((msg = dr.getMessage(600))); + ASSERT_TRUE((msg = dr.getMessage(TIMEOUT))); ds->acknowledge(std::move(msg)); - mbus::Reply::UP reply = sr.getReply(600); + mbus::Reply::UP reply = sr.getReply(TIMEOUT); ASSERT_TRUE(reply); } { @@ -382,9 +384,9 @@ Test::testExternMultipleSlobroks() mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0)); msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:%s;dst/session]", spec.c_str()))); ASSERT_TRUE(ss->send(std::move(msg)).isAccepted()); - ASSERT_TRUE((msg = dr.getMessage(600))); + ASSERT_TRUE((msg = dr.getMessage(TIMEOUT))); ds->acknowledge(std::move(msg)); - mbus::Reply::UP reply = sr.getReply(600); + mbus::Reply::UP reply = sr.getReply(TIMEOUT); ASSERT_TRUE(reply); } } @@ -410,7 +412,7 @@ Test::testLocalService() lst.insert(leaf[0]->getRoute().toString()); leaf[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(frame.getReceptor().getReply(600)); + ASSERT_TRUE(frame.getReceptor().getReply(TIMEOUT)); } EXPECT_EQUAL(10u, lst.size()); @@ -423,7 +425,7 @@ Test::testLocalService() lst.insert(leaf[0]->getRoute().toString()); leaf[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(frame.getReceptor().getReply(600)); + ASSERT_TRUE(frame.getReceptor().getReply(TIMEOUT)); } EXPECT_EQUAL(1u, lst.size()); EXPECT_EQUAL("docproc/cluster.default/*/chain.default", *lst.begin()); @@ -466,8 +468,8 @@ Test::testLocalServiceCache() barSelected[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); fooSelected[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(barFrame.getReceptor().getReply(600)); - ASSERT_TRUE(fooFrame.getReceptor().getReply(600)); + ASSERT_TRUE(barFrame.getReceptor().getReply(TIMEOUT)); + ASSERT_TRUE(fooFrame.getReceptor().getReply(TIMEOUT)); } void @@ -543,8 +545,8 @@ Test::testRoundRobinCache() barSelected[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); fooSelected[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(barFrame.getReceptor().getReply(600)); - ASSERT_TRUE(fooFrame.getReceptor().getReply(600)); + ASSERT_TRUE(barFrame.getReceptor().getReply(TIMEOUT)); + ASSERT_TRUE(fooFrame.getReceptor().getReply(TIMEOUT)); } void @@ -573,7 +575,7 @@ Test::multipleGetRepliesAreMergedToFoundDocument() mbus::Reply::UP reply(new GetDocumentReply(std::move(doc))); selected[i]->handleReply(std::move(reply)); } - mbus::Reply::UP reply = frame.getReceptor().getReply(600); + mbus::Reply::UP reply = frame.getReceptor().getReply(TIMEOUT); EXPECT_TRUE(reply); EXPECT_EQUAL(static_cast(DocumentProtocol::REPLY_GETDOCUMENT), reply->getType()); EXPECT_EQUAL(123456ULL, static_cast(*reply).getLastModified()); @@ -647,7 +649,7 @@ Test::testDocumentRouteSelectorIgnore() make_shared(*_docType, DocumentId("id:yarn:testdoc:n=1234:fluff")))); std::vector leaf; ASSERT_TRUE(frame.select(leaf, 0)); - mbus::Reply::UP reply = frame.getReceptor().getReply(600); + mbus::Reply::UP reply = frame.getReceptor().getReply(TIMEOUT); ASSERT_TRUE(reply); EXPECT_EQUAL(uint32_t(DocumentProtocol::REPLY_DOCUMENTIGNORED), reply->getType()); EXPECT_EQUAL(0u, reply->getNumErrors()); @@ -940,7 +942,7 @@ Test::testSubsetService() ASSERT_TRUE(frame.select(leaf, 1)); lst.insert(leaf[0]->getRoute().toString()); leaf[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(frame.getReceptor().getReply(600)); + ASSERT_TRUE(frame.getReceptor().getReply(TIMEOUT)); } ASSERT_TRUE(lst.size() > 1); // must have requeried @@ -959,7 +961,7 @@ Test::testSubsetService() prev = next; leaf[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(frame.getReceptor().getReply(600)); + ASSERT_TRUE(frame.getReceptor().getReply(TIMEOUT)); } // Test requerying for dropping nodes. @@ -976,7 +978,7 @@ Test::testSubsetService() mbus::Reply::UP reply(new mbus::EmptyReply()); reply->addError(mbus::Error(mbus::ErrorCode::NO_ADDRESS_FOR_SERVICE, route)); leaf[0]->handleReply(std::move(reply)); - ASSERT_TRUE(frame.getReceptor().getReply(600)); + ASSERT_TRUE(frame.getReceptor().getReply(TIMEOUT)); } EXPECT_EQUAL(10u, lst.size()); @@ -1018,8 +1020,8 @@ Test::testSubsetServiceCache() barSelected[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); fooSelected[0]->handleReply(mbus::Reply::UP(new mbus::EmptyReply())); - ASSERT_TRUE(barFrame.getReceptor().getReply(600)); - ASSERT_TRUE(fooFrame.getReceptor().getReply(600)); + ASSERT_TRUE(barFrame.getReceptor().getReply(TIMEOUT)); + ASSERT_TRUE(fooFrame.getReceptor().getReply(TIMEOUT)); } bool @@ -1034,7 +1036,7 @@ Test::trySelect(TestFrame &frame, uint32_t numSelects, const std::vector } else { frame.select(leaf, 0); } - if( ! frame.getReceptor().getReply(600)) { + if( ! frame.getReceptor().getReply(TIMEOUT)) { LOG(error, "Reply failed to propagate to reply handler."); return false; } diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp index 4cdc5d4ba14..9834e534a56 100644 --- a/documentapi/src/tests/policies/testframe.cpp +++ b/documentapi/src/tests/policies/testframe.cpp @@ -122,7 +122,7 @@ TestFrame::testSelect(const std::vector &expected) } node->handleReply(std::make_unique()); } - if (_handler.getReply(600).get() == nullptr) { + if (_handler.getReply(600s).get() == nullptr) { LOG(error, "Reply not propagated to handler."); return false; } @@ -166,7 +166,7 @@ TestFrame::testMerge(const ReplyMap &replies, node->handleReply(std::move(ret)); } - mbus::Reply::UP reply = _handler.getReply(600); + mbus::Reply::UP reply = _handler.getReply(600s); if (reply.get() == nullptr) { LOG(error, "Reply not propagated to handler."); return false; diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp index 877ade22e2a..729818c5c4a 100644 --- a/documentapi/src/tests/policyfactory/policyfactory.cpp +++ b/documentapi/src/tests/policyfactory/policyfactory.cpp @@ -73,6 +73,8 @@ createMessage() TEST_SETUP(Test); +const vespalib::duration TIMEOUT = 600s; + int Test::Main() { @@ -89,7 +91,7 @@ Test::Main() mbus::Route route = mbus::Route::parse("[MyPolicy]"); ASSERT_TRUE(src->send(createMessage(), route).isAccepted()); - mbus::Reply::UP reply = static_cast(src->getReplyHandler()).getReply(600); + mbus::Reply::UP reply = static_cast(src->getReplyHandler()).getReply(TIMEOUT); ASSERT_TRUE(reply); fprintf(stderr, "%s", reply->getTrace().toString().c_str()); EXPECT_EQUAL(1u, reply->getNumErrors()); @@ -101,7 +103,7 @@ Test::Main() protocol->putRoutingPolicyFactory("MyPolicy", std::make_shared()); ASSERT_TRUE(src->send(createMessage(), route).isAccepted()); - reply = static_cast(src->getReplyHandler()).getReply(600); + reply = static_cast(src->getReplyHandler()).getReply(TIMEOUT); ASSERT_TRUE(reply); fprintf(stderr, "%s", reply->getTrace().toString().c_str()); EXPECT_EQUAL(1u, reply->getNumErrors()); diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp index 3f94d120d66..32a36ef0b59 100644 --- a/documentapi/src/tests/routablefactory/routablefactory.cpp +++ b/documentapi/src/tests/routablefactory/routablefactory.cpp @@ -167,6 +167,8 @@ Test::Main() // /////////////////////////////////////////////////////////////////////////////// +const vespalib::duration TIMEOUT = 600s; + void Test::testFactory(TestData &data) { @@ -174,8 +176,8 @@ Test::testFactory(TestData &data) // Source should fail to encode the message. EXPECT_TRUE(data._srcSession->send(mbus::Message::UP(new MyMessage()), route).isAccepted()); - mbus::Reply::UP reply = data._srcHandler.getReply(600); - ASSERT_TRUE(reply.get() != NULL); + mbus::Reply::UP reply = data._srcHandler.getReply(TIMEOUT); + ASSERT_TRUE(reply); fprintf(stderr, "%s\n", reply->getTrace().toString().c_str()); ASSERT_TRUE(reply->hasErrors()); EXPECT_EQUAL((uint32_t)mbus::ErrorCode::ENCODE_ERROR, reply->getError(0).getCode()); @@ -185,8 +187,8 @@ Test::testFactory(TestData &data) data._srcProtocol->putRoutableFactory(MyMessage::TYPE, IRoutableFactory::SP(new MyMessageFactory()), vespalib::VersionSpecification()); EXPECT_TRUE(data._srcSession->send(mbus::Message::UP(new MyMessage()), route).isAccepted()); - reply = data._srcHandler.getReply(600); - ASSERT_TRUE(reply.get() != NULL); + reply = data._srcHandler.getReply(TIMEOUT); + ASSERT_TRUE(reply); fprintf(stderr, "%s\n", reply->getTrace().toString().c_str()); EXPECT_TRUE(reply->hasErrors()); EXPECT_EQUAL((uint32_t)mbus::ErrorCode::DECODE_ERROR, reply->getError(0).getCode()); @@ -196,13 +198,13 @@ Test::testFactory(TestData &data) data._dstProtocol->putRoutableFactory(MyMessage::TYPE, IRoutableFactory::SP(new MyMessageFactory()), vespalib::VersionSpecification()); EXPECT_TRUE(data._srcSession->send(mbus::Message::UP(new MyMessage()), route).isAccepted()); - mbus::Message::UP msg = data._dstHandler.getMessage(600); - ASSERT_TRUE(msg.get() != NULL); + mbus::Message::UP msg = data._dstHandler.getMessage(TIMEOUT); + ASSERT_TRUE(msg); reply.reset(new MyReply()); reply->swapState(*msg); data._dstSession->reply(std::move(reply)); - reply = data._srcHandler.getReply(600); - ASSERT_TRUE(reply.get() != NULL); + reply = data._srcHandler.getReply(TIMEOUT); + ASSERT_TRUE(reply); fprintf(stderr, "%s\n", reply->getTrace().toString().c_str()); EXPECT_TRUE(reply->hasErrors()); EXPECT_EQUAL((uint32_t)mbus::ErrorCode::ENCODE_ERROR, reply->getError(0).getCode()); @@ -212,13 +214,13 @@ Test::testFactory(TestData &data) data._dstProtocol->putRoutableFactory(MyReply::TYPE, IRoutableFactory::SP(new MyReplyFactory()), vespalib::VersionSpecification()); EXPECT_TRUE(data._srcSession->send(mbus::Message::UP(new MyMessage()), route).isAccepted()); - msg = data._dstHandler.getMessage(600); - ASSERT_TRUE(msg.get() != NULL); + msg = data._dstHandler.getMessage(TIMEOUT); + ASSERT_TRUE(msg); reply.reset(new MyReply()); reply->swapState(*msg); data._dstSession->reply(std::move(reply)); - reply = data._srcHandler.getReply(600); - ASSERT_TRUE(reply.get() != NULL); + reply = data._srcHandler.getReply(TIMEOUT); + ASSERT_TRUE(reply); fprintf(stderr, "%s\n", reply->getTrace().toString().c_str()); EXPECT_TRUE(reply->hasErrors()); EXPECT_EQUAL((uint32_t)mbus::ErrorCode::DECODE_ERROR, reply->getError(0).getCode()); @@ -228,13 +230,13 @@ Test::testFactory(TestData &data) data._srcProtocol->putRoutableFactory(MyReply::TYPE, IRoutableFactory::SP(new MyReplyFactory()), vespalib::VersionSpecification()); EXPECT_TRUE(data._srcSession->send(mbus::Message::UP(new MyMessage()), route).isAccepted()); - msg = data._dstHandler.getMessage(600); - ASSERT_TRUE(msg.get() != NULL); + msg = data._dstHandler.getMessage(TIMEOUT); + ASSERT_TRUE(msg); reply.reset(new MyReply()); reply->swapState(*msg); data._dstSession->reply(std::move(reply)); - reply = data._srcHandler.getReply(600); - ASSERT_TRUE(reply.get() != NULL); + reply = data._srcHandler.getReply(TIMEOUT); + ASSERT_TRUE(reply); fprintf(stderr, "%s\n", reply->getTrace().toString().c_str()); EXPECT_TRUE(!reply->hasErrors()); } -- cgit v1.2.3