From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Mar 2019 22:12:01 +0000 (-0500)
Subject: ceph_test_rados_api_tier_cxx: remove mimic checks
X-Git-Tag: v14.2.0~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27011%2Fhead;p=ceph.git

ceph_test_rados_api_tier_cxx: remove mimic checks

These checks don't work when the cluster is newer than mimic.

Instead, let's just try not to run this test on a pre-mimic cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc
index 0d4fde535705..a9727c08e0b6 100644
--- a/src/test/librados/tier_cxx.cc
+++ b/src/test/librados/tier_cxx.cc
@@ -3148,18 +3148,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestPromoteRead) {
 }
 
 TEST_F(LibRadosTwoPoolsPP, ManifestRefRead) {
-  // skip test if not yet mimic
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("mimic") == std::string::npos) {
-      cout << "cluster is not yet mimic, skipping test" << std::endl;
-      return;
-    }
-  }
+  // note: require >= mimic
 
   // create object
   {
@@ -6221,18 +6210,7 @@ TEST_F(LibRadosTwoPoolsECPP, SetRedirectRead) {
 }
 
 TEST_F(LibRadosTwoPoolsECPP, SetChunkRead) {
-  // skip test if not yet mimic
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("mimic") == std::string::npos) {
-      cout << "cluster is not yet mimic, skipping test" << std::endl;
-      return;
-    }
-  }
+  // note: require >= mimic
 
   // create object
   {
@@ -6296,18 +6274,7 @@ TEST_F(LibRadosTwoPoolsECPP, SetChunkRead) {
 }
 
 TEST_F(LibRadosTwoPoolsECPP, ManifestPromoteRead) {
-  // skip test if not yet mimic
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("mimic") == std::string::npos) {
-      cout << "cluster is not yet mimic, skipping test" << std::endl;
-      return;
-    }
-  }
+  // note: require >= mimic
 
   // create object
   {