]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/rbd_mirror: fix mock warnings 31518/head
authorMykola Golub <mgolub@suse.com>
Wed, 13 Nov 2019 14:46:04 +0000 (14:46 +0000)
committerMykola Golub <mgolub@suse.com>
Wed, 20 Nov 2019 08:12:41 +0000 (10:12 +0200)
(introduced by dea3d1b738181da9dc77418d4218eb596875847d)

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

src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc

index 8e13e8b37efff1775814c4afdbafdbe6fad49a98..5c4460145d46bdc8f5a46eb3cc2765b5dd6f643b 100644 (file)
@@ -310,6 +310,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,
                           int r) {
     EXPECT_CALL(mock_clone_request, construct());
@@ -447,6 +454,7 @@ TEST_F(TestMockImageReplayerCreateImageRequest, Clone) {
 
   expect_open_image(mock_open_image_request, m_remote_io_ctx,
                     m_remote_image_ctx->id, mock_remote_parent_image_ctx, 0);
+  expect_test_op_features(mock_remote_clone_image_ctx, false);
   expect_clone_image(mock_clone_request, 0);
   expect_close_image(mock_close_image_request, mock_remote_parent_image_ctx, 0);
 
@@ -681,6 +689,7 @@ TEST_F(TestMockImageReplayerCreateImageRequest, CloneError) {
 
   expect_open_image(mock_open_image_request, m_remote_io_ctx,
                     m_remote_image_ctx->id, mock_remote_parent_image_ctx, 0);
+  expect_test_op_features(mock_remote_clone_image_ctx, false);
   expect_clone_image(mock_clone_request, -EINVAL);
   expect_close_image(mock_close_image_request, mock_remote_parent_image_ctx, 0);
 
@@ -728,6 +737,7 @@ TEST_F(TestMockImageReplayerCreateImageRequest, CloneRemoteParentCloseError) {
 
   expect_open_image(mock_open_image_request, m_remote_io_ctx,
                     m_remote_image_ctx->id, mock_remote_parent_image_ctx, 0);
+  expect_test_op_features(mock_remote_clone_image_ctx, false);
   expect_clone_image(mock_clone_request, 0);
   expect_close_image(mock_close_image_request, mock_remote_parent_image_ctx,
                      -EINVAL);