RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 13:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph_test_rados_api_tier_cxx: remove mimic checks

Browse Source 
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>
This commit is contained in:
Sage Weil 2019-03-16 17:12:01 -05:00
parent bfd0581c5f
commit c2e1ddfe5e
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/test/librados/tier_cxx.cc
View File

@ -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
{