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 /storage/src/tests/storageserver/mergethrottlertest.cpp | |
| parent | 7700f411ea6f4a3e7c0599fae239ec84c18c0038 (diff) | |
timeout as duration
Conflicts:
messagebus/src/vespa/messagebus/testlib/testserver.cpp
Diffstat (limited to 'storage/src/tests/storageserver/mergethrottlertest.cpp')
| -rw-r--r-- | storage/src/tests/storageserver/mergethrottlertest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp index 30ad9b58e9f..178862d8393 100644 --- a/storage/src/tests/storageserver/mergethrottlertest.cpp +++ b/storage/src/tests/storageserver/mergethrottlertest.cpp @@ -267,7 +267,7 @@ TEST_F(MergeThrottlerTest, chain) { } auto cmd = std::make_shared<MergeBucketCommand>(bucket, nodes, UINT_MAX, 123); cmd->setPriority(7); - cmd->setTimeout(54321); + cmd->setTimeout(54321ms); StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0); cmd->setAddress(address); const uint16_t distributorIndex = 123; @@ -306,7 +306,7 @@ TEST_F(MergeThrottlerTest, chain) { // Ensure priority, cluster state version and timeout is correctly forwarded EXPECT_EQ(7, static_cast<int>(fwd->getPriority())); EXPECT_EQ(123, dynamic_cast<const MergeBucketCommand&>(*fwd).getClusterStateVersion()); - EXPECT_EQ(54321, dynamic_cast<const StorageCommand&>(*fwd).getTimeout()); + EXPECT_EQ(54321ms, dynamic_cast<const StorageCommand&>(*fwd).getTimeout()); } _topLinks[lastNodeIdx]->sendDown(fwd); @@ -332,7 +332,7 @@ TEST_F(MergeThrottlerTest, chain) { } EXPECT_EQ(7, static_cast<int>(fwd->getPriority())); EXPECT_EQ(123, dynamic_cast<const MergeBucketCommand&>(*fwd).getClusterStateVersion()); - EXPECT_EQ(54321, dynamic_cast<const StorageCommand&>(*fwd).getTimeout()); + EXPECT_EQ(54321ms, dynamic_cast<const StorageCommand&>(*fwd).getTimeout()); _topLinks[executorNode]->sendDown(fwd); } @@ -359,7 +359,7 @@ TEST_F(MergeThrottlerTest, chain) { fwd = _bottomLinks[executorNode]->getAndRemoveMessage(MessageType::MERGEBUCKET); EXPECT_EQ(7, static_cast<int>(fwd->getPriority())); EXPECT_EQ(123, dynamic_cast<const MergeBucketCommand&>(*fwd).getClusterStateVersion()); - EXPECT_EQ(54321, dynamic_cast<const StorageCommand&>(*fwd).getTimeout()); + EXPECT_EQ(54321ms, dynamic_cast<const StorageCommand&>(*fwd).getTimeout()); auto reply = std::make_shared<MergeBucketReply>(dynamic_cast<const MergeBucketCommand&>(*fwd)); reply->setResult(ReturnCode(ReturnCode::OK, "Great success! :D-|-<")); |