]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/librbd: utilize unique pool for cache tier testing 20486/head
authorJason Dillaman <dillaman@redhat.com>
Mon, 19 Feb 2018 15:25:15 +0000 (10:25 -0500)
committerJason Dillaman <dillaman@redhat.com>
Mon, 19 Feb 2018 15:25:15 +0000 (10:25 -0500)
Fixes: http://tracker.ceph.com/issues/11502
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/test/librbd/test_librbd.cc

index 7d1c88b0efb9e2883f41780b1400700e7d520647..574bf2724f538f32cecb59e8500e38ad0aec1d20 100644 (file)
@@ -3368,9 +3368,10 @@ TEST_F(TestLibRBD, ListChildrenTiered)
   REQUIRE_FEATURE(RBD_FEATURE_LAYERING);
 
   librbd::RBD rbd;
-  string pool_name1 = m_pool_name;
+  string pool_name1 = create_pool(true);
   string pool_name2 = create_pool(true);
   string pool_name3 = create_pool(true);
+  ASSERT_NE("", pool_name1);
   ASSERT_NE("", pool_name2);
   ASSERT_NE("", pool_name3);
 
@@ -3494,7 +3495,7 @@ TEST_F(TestLibRBD, ListChildrenTiered)
                       child_id2, pool_name1.c_str(), child_name2.c_str(), false,
                       child_id3, pool_name2.c_str(), child_name3.c_str(), true,
                       child_id4, pool_name2.c_str(), child_name4.c_str(), false);
-  
+
   ASSERT_EQ(0, rbd.trash_restore(ioctx3, child_id3, ""));
   test_list_children(parent, 4, pool_name2.c_str(), child_name1.c_str(),
                     pool_name1.c_str(), child_name2.c_str(),