diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-03 21:45:53 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-04 18:26:06 +0000 |
| commit | b8e151a435ccec1ecc03d98bac5b59f4f14514be (patch) | |
| tree | 140efda301a7e5adc407c44061ba5b0bb41dd212 /documentapi/src/tests/routablefactory | |
| parent | 7700f411ea6f4a3e7c0599fae239ec84c18c0038 (diff) | |
timeout as duration
Conflicts:
messagebus/src/vespa/messagebus/testlib/testserver.cpp
Diffstat (limited to 'documentapi/src/tests/routablefactory')
| -rw-r--r-- | documentapi/src/tests/routablefactory/routablefactory.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
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()); } |