From 151dc0038a83a933e91658340b0af6e5ad39410d Mon Sep 17 00:00:00 2001
From: Jay Zhuang <zjay@fb.com>
Date: Tue, 31 May 2022 13:02:50 -0700
Subject: [PATCH] Bypass tests instead of skipping (#10076)

Summary:
Make fb test infra happy, more details: https://github.com/facebook/rocksdb/issues/8048

Pull Request resolved: https://github.com/facebook/rocksdb/pull/10076

Test Plan: CI

Reviewed By: ajkr

Differential Revision: D36768766

Pulled By: jay-zhuang

fbshipit-source-id: 4f039a5c623abb6d4a7d09bbf97077618e7ec2c8
---
 db/db_basic_test.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/db_basic_test.cc b/db/db_basic_test.cc
index 32b1c8813..a95160a38 100644
--- a/db/db_basic_test.cc
+++ b/db/db_basic_test.cc
@@ -1467,7 +1467,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedSimpleUnsorted) {
 #endif  // USE_COROUTINES
   // Skip for unbatched MultiGet
   if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test is only for batched MultiGet");
+    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
     return;
   }
   do {
@@ -1521,7 +1521,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedSortedMultiFile) {
 #endif  // USE_COROUTINES
   // Skip for unbatched MultiGet
   if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test is only for batched MultiGet");
+    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
     return;
   }
   do {
@@ -1579,7 +1579,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedDuplicateKeys) {
 #endif  // USE_COROUTINES
   // Skip for unbatched MultiGet
   if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test is only for batched MultiGet");
+    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
     return;
   }
   Options opts = CurrentOptions();
@@ -1643,7 +1643,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedMultiLevel) {
 #endif  // USE_COROUTINES
   // Skip for unbatched MultiGet
   if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test is only for batched MultiGet");
+    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
     return;
   }
   Options options = CurrentOptions();
@@ -1729,7 +1729,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedMultiLevelMerge) {
 #endif  // USE_COROUTINES
   // Skip for unbatched MultiGet
   if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test is only for batched MultiGet");
+    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
     return;
   }
   Options options = CurrentOptions();
@@ -1826,7 +1826,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedValueSizeInMemory) {
 #endif  // USE_COROUTINES
   // Skip for unbatched MultiGet
   if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test is only for batched MultiGet");
+    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
     return;
   }
   CreateAndReopenWithCF({"pikachu"}, CurrentOptions());
@@ -1958,7 +1958,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedValueSizeMultiLevelMerge) {
 #endif  // USE_COROUTINES
   // Skip for unbatched MultiGet
   if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test is only for batched MultiGet");
+    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
     return;
   }
   Options options = CurrentOptions();
-- 
GitLab