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 /messagebus_test | |
| parent | 7700f411ea6f4a3e7c0599fae239ec84c18c0038 (diff) | |
timeout as duration
Conflicts:
messagebus/src/vespa/messagebus/testlib/testserver.cpp
Diffstat (limited to 'messagebus_test')
| -rw-r--r-- | messagebus_test/src/tests/error/cpp-client.cpp | 2 | ||||
| -rw-r--r-- | messagebus_test/src/tests/trace/trace.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp index f186be68d01..833d941da32 100644 --- a/messagebus_test/src/tests/error/cpp-client.cpp +++ b/messagebus_test/src/tests/error/cpp-client.cpp @@ -35,7 +35,7 @@ App::Main() msg.reset(new SimpleMessage("test")); msg->getTrace().setLevel(9); ss->send(std::move(msg), "test"); - reply = src.getReply(600); // 10 minutes timeout + reply = src.getReply(600s); // 10 minutes timeout if (reply.get() == 0) { fprintf(stderr, "CPP-CLIENT: no reply\n"); } else { diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp index a804bef6785..0d4c622a0df 100644 --- a/messagebus_test/src/tests/trace/trace.cpp +++ b/messagebus_test/src/tests/trace/trace.cpp @@ -103,8 +103,8 @@ Test::Main() Message::UP msg(new SimpleMessage("test")); msg->getTrace().setLevel(1); ss->send(std::move(msg), "test"); - reply = src.getReply(10); - if (reply.get() != NULL) { + reply = src.getReply(10s); + if (reply) { reply->getTrace().getRoot().normalize(); // resending breaks the trace, so retry until it has expected form if (!reply->hasErrors() && reply->getTrace().getRoot().encode() == expect.encode()) { |