test/librbd: fix issue with mock test when copy-on-read is enabled

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc
index c1c2aa4435a0cd0fbd08c81442223f912ebd88c0..6a55c87d217efe468675ab9ee34af77be799eb83 100644 (file)
--- 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,