From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Mar 2019 20:21:37 +0000 (-0500)
Subject: ceph_test_rados_api_tier_cxx: remove luminous check
X-Git-Tag: v14.2.0~2^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb29743a957114be9410126798bf74f80da79374;p=ceph.git

ceph_test_rados_api_tier_cxx: remove luminous check

It was a flawed check, since it would fail for anything newer than
luminous.  And in any case, we don't need it anymore.

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 e6acd3047710..0d4fde535705 100644
--- a/src/test/librados/tier_cxx.cc
+++ b/src/test/librados/tier_cxx.cc
@@ -2900,19 +2900,6 @@ TEST_F(LibRadosTwoPoolsPP, CachePin) {
 }
 
 TEST_F(LibRadosTwoPoolsPP, SetRedirectRead) {
-  // skip test if not yet luminous
-  {
-    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("luminous") == std::string::npos) {
-      cout << "cluster is not yet luminous, skipping test" << std::endl;
-      return;
-    }
-  }
-
   // create object
   {
     bufferlist bl;
@@ -6181,19 +6168,6 @@ TEST_F(LibRadosTwoPoolsECPP, CachePin) {
   cluster.wait_for_latest_osdmap();
 }
 TEST_F(LibRadosTwoPoolsECPP, SetRedirectRead) {
-  // skip test if not yet luminous
-  {
-    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("luminous") == std::string::npos) {
-      cout << "cluster is not yet luminous, skipping test" << std::endl;
-      return;
-    }
-  }
-
   // create object
   {
     bufferlist bl;