From 8f72e745e157cc12d76ca6babe956c5698ee297f Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 27 Apr 2017 16:21:33 -0400 Subject: [PATCH] test: remove hard-coded image name from RBD metadata test Fixes: http://tracker.ceph.com/issues/19798 Signed-off-by: Jason Dillaman --- src/test/librbd/test_librbd.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index b5a4765d6b5..3d208948092 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -5316,20 +5316,23 @@ TEST_F(TestLibRBD, Mirror) { // Add some images to the pool int order = 0; - ASSERT_EQ(0, create_image_pp(rbd, ioctx, "parent", 2 << 20, &order)); + std::string parent_name = get_temp_image_name(); + std::string child_name = get_temp_image_name(); + ASSERT_EQ(0, create_image_pp(rbd, ioctx, parent_name.c_str(), 2 << 20, + &order)); bool old_format; uint64_t features; ASSERT_EQ(0, get_features(&old_format, &features)); if ((features & RBD_FEATURE_LAYERING) != 0) { librbd::Image parent; - ASSERT_EQ(0, rbd.open(ioctx, parent, "parent", NULL)); + ASSERT_EQ(0, rbd.open(ioctx, parent, parent_name.c_str(), NULL)); ASSERT_EQ(0, parent.snap_create("parent_snap")); ASSERT_EQ(0, parent.close()); - ASSERT_EQ(0, rbd.open(ioctx, parent, "parent", "parent_snap")); + ASSERT_EQ(0, rbd.open(ioctx, parent, parent_name.c_str(), "parent_snap")); ASSERT_EQ(0, parent.snap_protect("parent_snap")); ASSERT_EQ(0, parent.close()); - ASSERT_EQ(0, rbd.clone(ioctx, "parent", "parent_snap", ioctx, "child", - features, &order)); + ASSERT_EQ(0, rbd.clone(ioctx, parent_name.c_str(), "parent_snap", ioctx, + child_name.c_str(), features, &order)); } ASSERT_EQ(RBD_MIRROR_MODE_IMAGE, mirror_mode); -- 2.39.5