From: root <zhangbingyi@umcloud.com>
Date: Fri, 26 Jul 2019 03:43:54 +0000 (+0800)
Subject: test/librados: avoid residual crush rule after test case execution
X-Git-Tag: v15.1.0~2046^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5567214094958c6156ec18876ad5f3d4e2805477;p=ceph-ci.git

test/librados: avoid residual crush rule after test case execution
Fixes: http://tracker.ceph.com/issues/40970
Signed-off-by: Bingyi Zhang <zhangbingyi@umcloud.com>
---

diff --git a/src/test/librados/aio_cxx.cc b/src/test/librados/aio_cxx.cc
index cf3750ea779..b2af18412ca 100644
--- a/src/test/librados/aio_cxx.cc
+++ b/src/test/librados/aio_cxx.cc
@@ -2252,7 +2252,7 @@ TEST(LibRadosAioEC, OmapPP) {
     EXPECT_EQ(-EOPNOTSUPP, my_completion->get_return_value());
   }
   ioctx.remove("test_obj");
-  destroy_one_pool_pp(pool_name, cluster);
+  destroy_one_ec_pool_pp(pool_name, cluster);
 }
 
 TEST(LibRadosAioEC, MultiWritePP) {
diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc
index 2417501489d..48769ba9aa7 100644
--- a/src/test/librados/tier_cxx.cc
+++ b/src/test/librados/tier_cxx.cc
@@ -5679,7 +5679,7 @@ TEST_F(LibRadosTierECPP, CallForcesPromote) {
   cluster.wait_for_latest_osdmap();
 
   ASSERT_EQ(0, cluster.pool_delete(cache_pool_name.c_str()));
-  ASSERT_EQ(0, destroy_one_pool_pp(pool_name, cluster));
+  ASSERT_EQ(0, destroy_one_ec_pool_pp(pool_name, cluster));
 }
 
 TEST_F(LibRadosTierECPP, HitSetNone) {