From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Tue, 12 May 2020 14:19:40 +0000 (+0300)
Subject: cls/2pc_queue: fix timing issue in test
X-Git-Tag: v16.1.0~2325^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35023%2Fhead;p=ceph.git

cls/2pc_queue: fix timing issue in test

Fixes: https://tracker.ceph.com/issues/45513

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
---

diff --git a/src/test/cls_2pc_queue/test_cls_2pc_queue.cc b/src/test/cls_2pc_queue/test_cls_2pc_queue.cc
index 9b325b258d07..f66fcc773234 100644
--- a/src/test/cls_2pc_queue/test_cls_2pc_queue.cc
+++ b/src/test/cls_2pc_queue/test_cls_2pc_queue.cc
@@ -505,7 +505,7 @@ TEST_F(TestCls2PCQueue, Cleanup)
       }
     });
   }
- 
+
   auto cleaned_reservations = 0U;
   auto committed_reservations = 0U;
   auto aborter = std::thread([this, &queue_name, &stale_time, &cleaned_reservations, &committed_reservations] {
@@ -544,7 +544,7 @@ TEST_F(TestCls2PCQueue, Cleanup)
   aborter.join();
 
   ASSERT_GT(cleaned_reservations, 0);
-  ASSERT_GT(committed_reservations, 0);
+  ASSERT_EQ(committed_reservations + cleaned_reservations, number_of_ops*max_workers);
   cls_2pc_reservations reservations;
   ASSERT_EQ(0, cls_2pc_queue_list_reservations(ioctx, queue_name, reservations));
   ASSERT_EQ(reservations.size(), 0);