summaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/matching/matching_test.cpp
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-16 22:55:04 -0600
committerGitHub <noreply@github.com>2019-12-16 22:55:04 -0600
commit06eae17d656fd281e05ca28d4e38696fc05d2dbf (patch)
tree3cd1f386e75cfdefaedb1ba19f8fbdc5533fc5b7 /searchcore/src/tests/proton/matching/matching_test.cpp
parent72e3bfb3c55653e57991ba3aff1f58f25f20dd8b (diff)
Revert "Revert "Balder/remove steadytimestamp 2""
Diffstat (limited to 'searchcore/src/tests/proton/matching/matching_test.cpp')
-rw-r--r--searchcore/src/tests/proton/matching/matching_test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index 88705e73bc5..8c4bf0d55b0 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -261,7 +261,7 @@ struct MyWorld {
static SearchRequest::SP createRequest(const vespalib::string &stack_dump)
{
SearchRequest::SP request(new SearchRequest);
- request->setTimeout(60 * fastos::TimeStamp::SEC);
+ request->setTimeout(60s);
setStackDump(*request, stack_dump);
request->maxhits = 10;
return request;
@@ -768,8 +768,7 @@ TEST("require that getSummaryFeatures prefers cached query setup") {
ASSERT_EQUAL(0u, fs->numDocs()); // "spread" has no hits
// Empty cache
- auto pruneTime = fastos::ClockSteady::now() +
- fastos::TimeStamp::MINUTE * 10;
+ auto pruneTime = vespalib::steady_clock::now() + 600s;
world.sessionManager->pruneTimedOutSessions(pruneTime);
fs = world.getSummaryFeatures(req);