summaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/documentdb/feedview
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-11-30 08:49:06 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-11-30 08:49:06 +0000
commit1195f94bcba1366ac1e7f94c3c6d714fc2a1d8f8 (patch)
tree329556b8de2b711381d1f49b7812bbd041c1ee6e /searchcore/src/tests/proton/documentdb/feedview
parentdd67bb4a5b7b5ca609f32b6a0255db4ccc4abe6f (diff)
Add DoneCallback to heartBeat so it can be tested without relying on sync.
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/feedview')
-rw-r--r--searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 6c45470bb42..4c566f6053b 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -367,7 +367,7 @@ struct MyAttributeWriter : public IAttributeWriter
(void) doc;
(void) lid;
}
- void heartBeat(SerialNum) override { ++_heartBeatCount; }
+ void heartBeat(SerialNum, OnWriteDoneType) override { ++_heartBeatCount; }
void compactLidSpace(uint32_t wantedLidLimit, SerialNum ) override {
_wantedLidLimit = wantedLidLimit;
}
@@ -1053,7 +1053,11 @@ TEST_F("require that removes are not remembered", SearchableFeedViewFixture)
TEST_F("require that heartbeat propagates to index- and attributeadapter",
SearchableFeedViewFixture)
{
- f.runInMasterAndSyncAll([&]() { f.fv.heartBeat(2); });
+ vespalib::Gate gate;
+ f.runInMaster([&, onDone = std::make_shared<vespalib::GateCallback>(gate)]() {
+ f.fv.heartBeat(2, std::move(onDone));
+ });
+ gate.await();
EXPECT_EQUAL(1, f.miw._heartBeatCount);
EXPECT_EQUAL(1, f.maw._heartBeatCount);
}