From 56e762b13aae302e6ab3cddb43f277d13ba6f43c Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Wed, 21 Feb 2018 10:46:21 +0200 Subject: [PATCH] test/librbd: fix required features for ViaLockOwner tests The rename operation is RPCed only when journaling is enabled. The snap_remove operation is RPCed only when either fast-diff or journaling is enabled. The rename, snap_create, and snap_remove do not require layering. Signed-off-by: Mykola Golub --- src/test/librbd/test_librbd.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index 574bf2724f5..addf74563cf 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -4555,7 +4555,7 @@ TEST_F(TestLibRBD, RebuildObjectMapViaLockOwner) TEST_F(TestLibRBD, RenameViaLockOwner) { - REQUIRE_FEATURE(RBD_FEATURE_LAYERING | RBD_FEATURE_EXCLUSIVE_LOCK); + REQUIRE_FEATURE(RBD_FEATURE_JOURNALING); librados::IoCtx ioctx; ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx)); @@ -4587,7 +4587,7 @@ TEST_F(TestLibRBD, RenameViaLockOwner) TEST_F(TestLibRBD, SnapCreateViaLockOwner) { - REQUIRE_FEATURE(RBD_FEATURE_LAYERING | RBD_FEATURE_EXCLUSIVE_LOCK); + REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK); librados::IoCtx ioctx; ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx)); @@ -4631,7 +4631,7 @@ TEST_F(TestLibRBD, SnapCreateViaLockOwner) TEST_F(TestLibRBD, SnapRemoveViaLockOwner) { - REQUIRE_FEATURE(RBD_FEATURE_LAYERING | RBD_FEATURE_EXCLUSIVE_LOCK); + REQUIRE_FEATURE(RBD_FEATURE_FAST_DIFF); librados::IoCtx ioctx; ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx)); -- 2.39.5