From: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Date: Tue, 23 Nov 2021 14:25:46 +0000 (+0100)
Subject: rbd-mirror: make RemoveImmediateUpdate test synchronous
X-Git-Tag: v17.1.0~376^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9385acfc25a2bd0e214b4191109b7ed84f5826b4;p=ceph.git

rbd-mirror: make RemoveImmediateUpdate test synchronous

Try fixing sporadic failure linked in the tracker in
TestMockMirrorStatusUpdater.RemoveImmediateUpdate by making it
synchronous.

Fixes: https://tracker.ceph.com/issues/53375
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
---

diff --git a/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc b/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc
index ac8009df1379e..4db576eb4343b 100644
--- a/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc
+++ b/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc
@@ -566,9 +566,9 @@ TEST_F(TestMockMirrorStatusUpdater, RemoveImmediateUpdate) {
   mock_mirror_status_updater.set_mirror_image_status("1", {}, false);
 
   C_SaferCond ctx;
-  expect_work_queue(true);
-  expect_work_queue(true);
+  expect_work_queue(false);
   expect_mirror_status_removes({"1"}, 0);
+  expect_work_queue(false);
   mock_mirror_status_updater.remove_mirror_image_status("1", true, &ctx);
   ASSERT_EQ(0, ctx.wait());