aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/engine
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2021-10-14 08:22:47 +0200
committerGitHub <noreply@github.com>2021-10-14 08:22:47 +0200
commitadad7cc066e7debe8137737a8ce9c6ce377a2c1a (patch)
tree5850be932489b07b2c1333472da4a4fcbe9fbae6 /searchlib/src/tests/engine
parent139deef553e455442482fdbf545c9db751617f33 (diff)
parent3534365cd5acc7c9e427bee0876587c43d5c2ac5 (diff)
Merge pull request #19534 from vespa-engine/arnej/only-slime-docsums
Arnej/only slime docsums
Diffstat (limited to 'searchlib/src/tests/engine')
-rw-r--r--searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp6
-rw-r--r--searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp2
2 files changed, 2 insertions, 6 deletions
diff --git a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp
index 5efe3f9fe8c..973d2bcc15c 100644
--- a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp
+++ b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp
@@ -321,14 +321,10 @@ TEST_F(SearchReplyTest, require_that_issues_are_converted_to_errors) {
struct DocsumRequestTest : ::testing::Test {
Converter::ProtoDocsumRequest proto;
DocsumRequest request;
- DocsumRequestTest() : proto(), request(true) {} // <- use root slime
+ DocsumRequestTest() : proto(), request() {}
void convert() { Converter::docsum_request_from_proto(proto, request); }
};
-TEST_F(DocsumRequestTest, require_that_root_slime_is_used) {
- EXPECT_TRUE(request.useRootSlime());
-}
-
TEST_F(DocsumRequestTest, require_that_timeout_is_converted) {
proto.set_timeout(500);
convert();
diff --git a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp
index 304e33900a6..41f471f0a7a 100644
--- a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp
+++ b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp
@@ -52,7 +52,7 @@ struct MyDocsumServer : DocsumServer {
auto reply = std::make_unique<DocsumReply>();
reply->_root = std::make_unique<Slime>();
auto &list = reply->_root->setArray();
- list.addObject().setBool("use_root_slime", req->useRootSlime());
+ list.addObject().setBool("use_root_slime", true);
list.addObject().setString("ranking", req->ranking);
reply->request = std::move(req);
std::this_thread::sleep_for(std::chrono::milliseconds(5));