]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-mirror: make RemoveImmediateUpdate test synchronous 44064/head
authorArthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Tue, 23 Nov 2021 14:25:46 +0000 (15:25 +0100)
committerArthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Tue, 23 Nov 2021 14:30:33 +0000 (15:30 +0100)
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>
src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc

index ac8009df1379e5407779ee51e1fe09cac6803413..4db576eb4343b744740ec9c805c42900c87ef9ca 100644 (file)
@@ -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());