From 2501bb8e73e687e6b25344c20df795825c6c4fc3 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 29 Jan 2018 17:50:49 -0500 Subject: [PATCH] test/librbd: fix negative test cases for clone Signed-off-by: Jason Dillaman --- src/test/librbd/test_librbd.cc | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index a4f048b35202c..7d1c88b0efb9e 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -2833,6 +2833,10 @@ TEST_F(TestLibRBD, TestIOToSnapshot) TEST_F(TestLibRBD, TestClone) { REQUIRE_FEATURE(RBD_FEATURE_LAYERING); + ASSERT_EQ(0, rados_conf_set(_cluster, "rbd_default_clone_format", "1")); + BOOST_SCOPE_EXIT_ALL(&) { + ASSERT_EQ(0, rados_conf_set(_cluster, "rbd_default_clone_format", "auto")); + }; rados_ioctx_t ioctx; rbd_image_info_t pinfo, cinfo; @@ -2993,6 +2997,10 @@ TEST_F(TestLibRBD, TestClone) TEST_F(TestLibRBD, TestClone2) { REQUIRE_FEATURE(RBD_FEATURE_LAYERING); + ASSERT_EQ(0, rados_conf_set(_cluster, "rbd_default_clone_format", "2")); + BOOST_SCOPE_EXIT_ALL(&) { + ASSERT_EQ(0, rados_conf_set(_cluster, "rbd_default_clone_format", "auto")); + }; rados_ioctx_t ioctx; rados_ioctx_create(_cluster, m_pool_name.c_str(), &ioctx); @@ -3055,18 +3063,6 @@ TEST_F(TestLibRBD, TestClone2) ASSERT_EQ(0, rbd_close(parent)); ASSERT_EQ(0, rbd_open(ioctx, parent_name.c_str(), &parent, "parent_snap")); - ASSERT_EQ(-EINVAL, clone_image(ioctx, parent, parent_name.c_str(), "parent_snap", - ioctx, child_name.c_str(), features, &order)); - - // unprotected image should fail unprotect - ASSERT_EQ(-EINVAL, rbd_snap_unprotect(parent, "parent_snap")); - printf("can't unprotect an unprotected snap\n"); - - ASSERT_EQ(0, rbd_snap_protect(parent, "parent_snap")); - // protecting again should fail - ASSERT_EQ(-EBUSY, rbd_snap_protect(parent, "parent_snap")); - printf("can't protect a protected snap\n"); - // This clone and open should work ASSERT_EQ(0, clone_image(ioctx, parent, parent_name.c_str(), "parent_snap", ioctx, child_name.c_str(), features, &order)); -- 2.39.5