test: wait for pending journal replay operations

Signed-off-by: Venky Shankar <vshankar@redhat.com>

diff --git a/src/test/librbd/journal/test_mock_Replay.cc b/src/test/librbd/journal/test_mock_Replay.cc
index 7b65b9618076ac2c456da29e4ce1f97453a12190..452011146b087adfbeafa309b144b4ab5ab267e3 100644 (file)
--- a/src/test/librbd/journal/test_mock_Replay.cc
+++ b/src/test/librbd/journal/test_mock_Replay.cc
@@ -830,6 +830,7 @@ TEST_F(TestMockJournalReplay, MissingOpFinishEvent) {
                                          "snap")},
                &on_snap_remove_ready,
               &on_snap_remove_safe);
+  ictx->op_work_queue->drain();
   ASSERT_EQ(0, on_snap_remove_ready.wait());
 
   C_SaferCond on_snap_create_ready;
@@ -840,6 +841,7 @@ TEST_F(TestMockJournalReplay, MissingOpFinishEvent) {
                                          "snap")},
                &on_snap_create_ready,
               &on_snap_create_safe);
+  ictx->op_work_queue->drain();
 
   C_SaferCond on_shut_down;
   mock_journal_replay.shut_down(false, &on_shut_down);
@@ -886,6 +888,7 @@ TEST_F(TestMockJournalReplay, MissingOpFinishEventCancelOps) {
                                          "snap")},
                &on_snap_remove_ready,
               &on_snap_remove_safe);
+  ictx->op_work_queue->drain();
   ASSERT_EQ(0, on_snap_remove_ready.wait());
 
   C_SaferCond on_snap_create_ready;
@@ -896,6 +899,7 @@ TEST_F(TestMockJournalReplay, MissingOpFinishEventCancelOps) {
                                          "snap")},
                &on_snap_create_ready,
               &on_snap_create_safe);
+  ictx->op_work_queue->drain();
 
   C_SaferCond on_resume;
   when_replay_op_ready(mock_journal_replay, 123, &on_resume);