From d7e6e8d60309e4800389b36f786b633d0ca2ec07 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 18 Apr 2017 16:07:20 -0400 Subject: [PATCH] ceph_test_rados_api_list: make LibRadosListNP.ListObjectsError delete pool even if faking Signed-off-by: Sage Weil --- src/test/librados/list.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/librados/list.cc b/src/test/librados/list.cc index 948063b58eda..54f4459b28d8 100644 --- a/src/test/librados/list.cc +++ b/src/test/librados/list.cc @@ -964,7 +964,17 @@ TEST_F(LibRadosListNP, ListObjectsError) { memset(buf, 0xcc, sizeof(buf)); rados_ioctx_set_namespace(ioctx, ""); ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0)); - ASSERT_EQ(0, rados_pool_delete(cluster, pool_name.c_str())); + + //ASSERT_EQ(0, rados_pool_delete(cluster, pool_name.c_str())); + { + char *buf, *st; + size_t buflen, stlen; + string c = "{\"prefix\":\"osd pool rm\",\"pool\": \"" + pool_name + + "\",\"pool2\":\"" + pool_name + + "\",\"sure\": \"--yes-i-really-really-mean-it-not-faking\"}"; + const char *cmd[2] = { c.c_str(), 0 }; + ASSERT_EQ(0, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen)); + } rados_list_ctx_t ctx; ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx)); -- 2.47.3