]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/objectstore: use GTEST_SKIP for smr
authorLaura Flores <lflores@redhat.com>
Tue, 24 May 2022 17:19:28 +0000 (17:19 +0000)
committerLaura Flores <lflores@redhat.com>
Tue, 31 May 2022 22:59:53 +0000 (22:59 +0000)
If certain tests are smr=true, the test
will be skipped with GTEST_SKIP instead of
the original return message.

Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit 162e9adda610b3badb3da72b4fb7567e7426c7fb)

src/test/objectstore/store_test.cc

index e45d5543a108ce54da41adba587b0298ed65fd87..dd95a0bc10875b68b86e78cf06441f413d428fdc 100644 (file)
@@ -7340,8 +7340,7 @@ TEST_P(StoreTestSpecificAUSize, ZeroBlockDetectionSmallOverwrite) {
     GTEST_SKIP() << "not bluestore or bluestore_zero_block_detection=false, skipping";
   }
   if (smr) {
-    cout << "SKIP" << std::endl;
-    return;
+    GTEST_SKIP() << "smr, skipping";
   }
 
   size_t block_size = 65536;
@@ -7521,8 +7520,7 @@ TEST_P(StoreTestSpecificAUSize, ZeroBlockDetectionBigOverwrite) {
     GTEST_SKIP() << "not bluestore or bluestore_zero_block_detection=false, skipping";
   }
   if (smr) {
-    cout << "SKIP" << std::endl;
-    return;
+    GTEST_SKIP() << "smr, skipping";
   }
 
   size_t block_size = 4096;