aboutsummaryrefslogtreecommitdiffstats
path: root/storage/src/tests/storageserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-10-26 16:40:36 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-10-26 16:40:36 +0000
commit9b7cc9c30b8333bdd2d06696ff27ce97fb130c9d (patch)
treea0d39ecdbb22c138abd6648eca3da382fbbb4f2f /storage/src/tests/storageserver
parent22f126bc61fd6bb16871132f95ec5073f69cedff (diff)
- Honour max merge chunk size in one place.
- GC incomplete enable_merge_local_node_choose_docs_optimalization handling.
Diffstat (limited to 'storage/src/tests/storageserver')
-rw-r--r--storage/src/tests/storageserver/mergethrottlertest.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp
index e6067fa561c..0271af85fef 100644
--- a/storage/src/tests/storageserver/mergethrottlertest.cpp
+++ b/storage/src/tests/storageserver/mergethrottlertest.cpp
@@ -1367,8 +1367,7 @@ TEST_F(MergeThrottlerTest, get_bucket_diff_command_not_in_active_set_is_rejected
TEST_F(MergeThrottlerTest, apply_bucket_diff_command_not_in_active_set_is_rejected) {
document::BucketId bucket(16, 1234);
std::vector<api::GetBucketDiffCommand::Node> nodes;
- auto applyDiffCmd = std::make_shared<api::ApplyBucketDiffCommand>(
- makeDocumentBucket(bucket), nodes, api::Timestamp(1234));
+ auto applyDiffCmd = std::make_shared<api::ApplyBucketDiffCommand>(makeDocumentBucket(bucket), nodes);
ASSERT_NO_FATAL_FAILURE(sendAndExpectReply(applyDiffCmd,
api::MessageType::APPLYBUCKETDIFF_REPLY,