diff options
| author | Sage Weil <sage@redhat.com> | 2019-03-16 23:12:01 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-03-16 23:12:01 +0100 |
| commit | c2e1ddfe5ec064f78f561f8e7bbfec44fd7bc993 (patch) | |
| tree | fb0600cc3ff686699663a4b31061630ea32676d2 | |
| parent | qa/suites/upgrade/mimic-x/parallel: enable all classes (diff) | |
| download | ceph-c2e1ddfe5ec064f78f561f8e7bbfec44fd7bc993.tar.xz ceph-c2e1ddfe5ec064f78f561f8e7bbfec44fd7bc993.zip | |
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>
| -rw-r--r-- | src/test/librados/tier_cxx.cc | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc index 0d4fde53570..a9727c08e0b 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 { |