testlibrbd: recreate test pool each time

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/testlibrbd.c b/src/testlibrbd.c
index e37e21e5c9baf9439fa0151d9394f26790916757..6d079e67bdd6d76aa935f1819d21bac0f8a9249d 100644 (file)
--- a/src/testlibrbd.c
+++ b/src/testlibrbd.c
@@ -264,8 +264,17 @@ int main(int argc, const char **argv)
   assert(rados_create(&cluster, NULL) == 0);
   assert(rados_conf_read_file(cluster, "/etc/ceph/ceph.conf") == 0);
   rados_reopen_log(cluster);
-  assert(rados_ioctx_open(cluster, TEST_POOL, &io_ctx) == 0);
   assert(rados_connect(cluster) == 0);
+  if (rados_ioctx_lookup(cluster, TEST_POOL) != -ENOENT) {
+    int r = rados_pool_delete(cluster, TEST_POOL);
+    printf("rados_pool_delete returned %d\n", r);
+  }
+  int r = rados_pool_create(cluster, TEST_POOL);
+  printf("rados_pool_create returned %d\n", r);
+  assert(rados_ioctx_open(cluster, TEST_POOL, &io_ctx) == 0);
+  struct rados_ioctx_stat_t stats;
+  rados_ioctx_stat(io_ctx, &stats);
+  test_ls(io_ctx, 0);
   test_ls(io_ctx, 0);
   test_create_and_stat(io_ctx, TEST_IMAGE, MB_BYTES(1));
   assert(rbd_open(io_ctx, TEST_IMAGE, &image, NULL) == 0);

diff --git a/src/testlibrbdpp.cc b/src/testlibrbdpp.cc
index 9bf7af8f4fcd244f2989d8b9fc865914328fbe72..b06bdaa3cc236e9a35edf3f7ad1bb4f1426e9745 100644 (file)
--- a/src/testlibrbdpp.cc
+++ b/src/testlibrbdpp.cc
@@ -248,6 +248,12 @@ int main(int argc, const char **argv)
   rbd = new librbd::RBD();
   assert(rados.init(NULL) == 0);
   assert(rados.connect() == 0);
+  if (rados.pool_lookup(TEST_POOL) != -ENOENT) {
+    int r = rados.pool_delete(TEST_POOL);
+    printf("rados.pool_delete returned %d\n", r);
+  }
+  int r = rados.pool_create(TEST_POOL);
+  printf("rados.pool_create returned %d\n", r);
   assert(rados.ioctx_open(TEST_POOL, io_ctx) == 0);
   test_ls(io_ctx, 0);
   test_create_and_stat(io_ctx, TEST_IMAGE, MB_BYTES(1));