Add DoneCallback to removeDocuments.

1 files changed, 7 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 4c566f6053b..5f5196c801f 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -515,11 +515,6 @@ struct FixtureBase
     }
 
     template <typename FunctionType>
-    void runInMasterAndSyncAll(FunctionType func) {
-        test::runInMaster(_writeService, func);
-        _writeServiceReal.sync_all_executors();
-    }
-    template <typename FunctionType>
     void runInMaster(FunctionType func) {
         test::runInMaster(_writeService, func);
     }
@@ -617,10 +612,10 @@ struct FixtureBase
         gate.await();
     }
 
-    void performDeleteBucket(DeleteBucketOperation &op) {
+    void performDeleteBucket(DeleteBucketOperation &op, IDestructorCallback::SP onDone) {
         getFeedView().prepareDeleteBucket(op);
         op.setSerialNum(++serial);
-        getFeedView().handleDeleteBucket(op);
+        getFeedView().handleDeleteBucket(op, onDone);
     }
 
     void performForceCommit(IDestructorCallback::SP onDone) {
@@ -950,7 +945,11 @@ TEST_F("require that handleDeleteBucket() removes documents", SearchableFeedView
 
     // delete bucket for user 1
     DeleteBucketOperation op(docs[0].bid);
-    f.runInMasterAndSyncAll([&]() { f.performDeleteBucket(op); });
+    vespalib::Gate gate;
+    f.runInMaster([&, onDone=std::make_shared<GateCallback>(gate)]() {
+        f.performDeleteBucket(op, std::move(onDone));
+    });
+    gate.await();
     f.dms_commit();
 
     EXPECT_EQUAL(0u, f.getBucketDB()->get(docs[0].bid).getDocumentCount());