diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-03-07 14:33:54 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-03-07 14:48:40 +0000 |
commit | afff1df19a3f532648bb55aab8dc15457ff9f062 (patch) | |
tree | 5c52580305085975c6f6c627d68ace071303995b /searchcore/src/tests/proton/index | |
parent | 4a920e684c49bdc8147fc6ee5fde4b2c1802fc1b (diff) |
Wire in the real clcok and use an explicit RequestContext instead of the dummy FakeRequestContext intended only for tests.
Diffstat (limited to 'searchcore/src/tests/proton/index')
-rw-r--r-- | searchcore/src/tests/proton/index/fusionrunner_test.cpp | 1 | ||||
-rw-r--r-- | searchcore/src/tests/proton/index/indexcollection_test.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp index 38314abd7e5..1b04415b78f 100644 --- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp +++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp @@ -18,6 +18,7 @@ #include <vespa/vespalib/util/destructor_callbacks.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/size_literals.h> +#include <vespa/searchlib/queryeval/fake_requestcontext.h> #include <set> using document::Document; diff --git a/searchcore/src/tests/proton/index/indexcollection_test.cpp b/searchcore/src/tests/proton/index/indexcollection_test.cpp index 70141f057bf..6f6fe3d4e41 100644 --- a/searchcore/src/tests/proton/index/indexcollection_test.cpp +++ b/searchcore/src/tests/proton/index/indexcollection_test.cpp @@ -5,7 +5,7 @@ #include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/util/threadstackexecutor.h> - +#include <vespa/vespalib/util/testclock.h> #include <vespa/log/log.h> LOG_SETUP("indexcollection_test"); @@ -43,6 +43,7 @@ public: std::shared_ptr<IndexSearchable> _source2; std::shared_ptr<IndexSearchable> _fusion_source; vespalib::ThreadStackExecutor _executor; + vespalib::TestClock _clock; std::shared_ptr<IndexSearchable> _warmup; void expect_searchable_can_be_appended(IndexCollection::UP collection) { @@ -76,7 +77,7 @@ public: } IndexCollection::UP create_warmup(const IndexCollection::SP& prev, const IndexCollection::SP& next) { - return std::make_unique<WarmupIndexCollection>(WarmupConfig(1s, false), prev, next, *_warmup, _executor, *this); + return std::make_unique<WarmupIndexCollection>(WarmupConfig(1s, false), prev, next, *_warmup, _executor, _clock.clock(), *this); } void warmupDone(std::shared_ptr<WarmupIndexCollection> current) override { |