From 5567214094958c6156ec18876ad5f3d4e2805477 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Jul 2019 11:43:54 +0800 Subject: [PATCH] test/librados: avoid residual crush rule after test case execution Fixes: http://tracker.ceph.com/issues/40970 Signed-off-by: Bingyi Zhang --- src/test/librados/aio_cxx.cc | 2 +- src/test/librados/tier_cxx.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/librados/aio_cxx.cc b/src/test/librados/aio_cxx.cc index cf3750ea7798..b2af18412ca9 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 2417501489da..48769ba9aa7e 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) { -- 2.47.3