From de18e8e25f643df713d830014fcc1edb30dd8c67 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 22 Sep 2020 16:17:35 -0400 Subject: [PATCH] test/librbd: fix issue with mock test when copy-on-read is enabled Signed-off-by: Jason Dillaman --- .../librbd/exclusive_lock/test_mock_PreReleaseRequest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc index c1c2aa4435a..6a55c87d217 100644 --- a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc +++ b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc @@ -99,8 +99,10 @@ public: MockImageDispatch &mock_image_dispatch, bool init_shutdown, int r) { expect_test_features(mock_image_ctx, RBD_FEATURE_EXCLUSIVE_LOCK, true); - expect_test_features(mock_image_ctx, RBD_FEATURE_JOURNALING, - ((mock_image_ctx.features & RBD_FEATURE_JOURNALING) != 0)); + if (!mock_image_ctx.clone_copy_on_read) { + expect_test_features(mock_image_ctx, RBD_FEATURE_JOURNALING, + ((mock_image_ctx.features & RBD_FEATURE_JOURNALING) != 0)); + } if (mock_image_ctx.clone_copy_on_read || (mock_image_ctx.features & RBD_FEATURE_JOURNALING) != 0) { expect_set_require_lock(mock_image_dispatch, init_shutdown, -- 2.39.5