test/cls_rgw: make bi_list test not rely on osd_max_omap_entries_per_request

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit d02d91f6f20a3431fd758a67a0bf77ea4bd4d883)

Conflicts:
	src/test/cls_rgw/test_cls_rgw.cc (trivial: indentation)

diff --git a/src/test/cls_rgw/test_cls_rgw.cc b/src/test/cls_rgw/test_cls_rgw.cc
index 5fcf6c8f4d2f1b1a62fb5751c4b50660babe8576..4d9c30d967800e16a82a71787011040e42f26eb2 100644 (file)
--- a/src/test/cls_rgw/test_cls_rgw.cc
+++ b/src/test/cls_rgw/test_cls_rgw.cc
@@ -497,8 +497,8 @@ TEST(cls_rgw, bi_list)
   ret = cls_rgw_bi_list(ioctx, bucket_oid, name, marker, num_objs + 10, &entries,
                            &is_truncated);
   ASSERT_EQ(ret, 0);
-  if (cct->_conf->osd_max_omap_entries_per_request < num_objs) {
-    ASSERT_EQ(entries.size(), cct->_conf->osd_max_omap_entries_per_request);
+  if (is_truncated) {
+    ASSERT_LT(entries.size(), num_objs);
   } else {
     ASSERT_EQ(entries.size(), num_objs);
   }
@@ -511,7 +511,7 @@ TEST(cls_rgw, bi_list)
                          &is_truncated);
     ASSERT_EQ(ret, 0);
     if (is_truncated) {
-      ASSERT_EQ(entries.size(), std::min(max, cct->_conf->osd_max_omap_entries_per_request));
+      ASSERT_LT(entries.size(), num_objs - num_entries);
     } else {
       ASSERT_EQ(entries.size(), num_objs - num_entries);
     }
@@ -535,7 +535,7 @@ TEST(cls_rgw, bi_list)
                            &is_truncated);
       ASSERT_EQ(ret, 0);
       if (is_truncated) {
-       ASSERT_EQ(entries.size(), cct->_conf->osd_max_omap_entries_per_request);
+       ASSERT_LT(entries.size(), num_objs - num_entries);
       } else {
        ASSERT_EQ(entries.size(), num_objs - num_entries);
       }