From: Mykola Golub <mgolub@suse.com>
Date: Wed, 13 Nov 2019 14:46:04 +0000 (+0000)
Subject: test/rbd_mirror: fix mock warnings
X-Git-Tag: v13.2.9~96^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12bcc4cb9f4d33a2ac21effe7c7f09a7131485e1;p=ceph.git

test/rbd_mirror: fix mock warnings

(introduced by dea3d1b738181da9dc77418d4218eb596875847d)

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit e42a21307fc3670266e1d7bdfb67ff16d11bd023)

Conflicts:
	src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc (trivial)
---

diff --git a/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc
index b78c1d3b03bc..dd6a94af29c0 100644
--- a/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc
+++ b/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc
@@ -293,6 +293,13 @@ public:
         }));
   }
 
+  void expect_test_op_features(librbd::MockTestImageCtx& mock_image_ctx,
+                               bool enabled) {
+    EXPECT_CALL(mock_image_ctx,
+                test_op_features(RBD_OPERATION_FEATURE_CLONE_CHILD))
+      .WillOnce(Return(enabled));
+  }
+
   void expect_clone_image(MockCloneRequest &mock_clone_request,
 			  librbd::MockTestImageCtx &mock_parent_imctx,
                           int r) {
@@ -389,6 +396,7 @@ TEST_F(TestMockImageReplayerCreateImageRequest, Clone) {
   expect_open_image(mock_open_image_request, m_local_io_ctx,
                     "local parent id", mock_local_parent_image_ctx, 0);
   expect_snap_set(mock_local_parent_image_ctx, "snap", 0);
+  expect_test_op_features(mock_remote_clone_image_ctx, false);
   expect_clone_image(mock_clone_request, mock_local_parent_image_ctx, 0);
   expect_close_image(mock_close_image_request, mock_local_parent_image_ctx, 0);
   expect_close_image(mock_close_image_request, mock_remote_parent_image_ctx, 0);
@@ -601,6 +609,7 @@ TEST_F(TestMockImageReplayerCreateImageRequest, CloneError) {
   expect_open_image(mock_open_image_request, m_local_io_ctx,
                     "local parent id", mock_local_parent_image_ctx, 0);
   expect_snap_set(mock_local_parent_image_ctx, "snap", 0);
+  expect_test_op_features(mock_remote_clone_image_ctx, false);
   expect_clone_image(mock_clone_request, mock_local_parent_image_ctx, -EINVAL);
   expect_close_image(mock_close_image_request, mock_local_parent_image_ctx, 0);
   expect_close_image(mock_close_image_request, mock_remote_parent_image_ctx, 0);
@@ -646,6 +655,7 @@ TEST_F(TestMockImageReplayerCreateImageRequest, CloneLocalParentCloseError) {
   expect_open_image(mock_open_image_request, m_local_io_ctx,
                     "local parent id", mock_local_parent_image_ctx, 0);
   expect_snap_set(mock_local_parent_image_ctx, "snap", 0);
+  expect_test_op_features(mock_remote_clone_image_ctx, false);
   expect_clone_image(mock_clone_request, mock_local_parent_image_ctx, 0);
   expect_close_image(mock_close_image_request, mock_local_parent_image_ctx, -EINVAL);
   expect_close_image(mock_close_image_request, mock_remote_parent_image_ctx, 0);
@@ -691,6 +701,7 @@ TEST_F(TestMockImageReplayerCreateImageRequest, CloneRemoteParentCloseError) {
   expect_open_image(mock_open_image_request, m_local_io_ctx,
                     "local parent id", mock_local_parent_image_ctx, 0);
   expect_snap_set(mock_local_parent_image_ctx, "snap", 0);
+  expect_test_op_features(mock_remote_clone_image_ctx, false);
   expect_clone_image(mock_clone_request, mock_local_parent_image_ctx, 0);
   expect_close_image(mock_close_image_request, mock_local_parent_image_ctx, 0);
   expect_close_image(mock_close_image_request, mock_remote_parent_image_ctx, -EINVAL);