From bcf0ee71475b99309f3ac4015dd274a79dc71b06 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sun, 4 Sep 2022 19:14:04 +0200 Subject: [PATCH] librbd: make RefreshRequest tests compatible with clone v1 Signed-off-by: Ilya Dryomov (cherry picked from commit 36f1d515ca92784631d29fa1c5d1465e957af2a7) --- src/test/librbd/image/test_mock_RefreshRequest.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/librbd/image/test_mock_RefreshRequest.cc b/src/test/librbd/image/test_mock_RefreshRequest.cc index 206b8d7b68c4..e60409615ecd 100644 --- a/src/test/librbd/image/test_mock_RefreshRequest.cc +++ b/src/test/librbd/image/test_mock_RefreshRequest.cc @@ -834,8 +834,10 @@ TEST_F(TestMockImageRefreshRequest, SuccessChild) { expect_op_work_queue(mock_image_ctx); expect_test_features(mock_image_ctx); + mock_image_ctx.features &= ~RBD_FEATURE_OPERATIONS; + InSequence seq; - expect_get_mutable_metadata(mock_image_ctx, ictx2->features, 0); + expect_get_mutable_metadata(mock_image_ctx, mock_image_ctx.features, 0); expect_get_parent(mock_image_ctx, 0); MockGetMetadataRequest mock_get_metadata_request; expect_get_metadata(mock_image_ctx, mock_get_metadata_request, @@ -843,7 +845,6 @@ TEST_F(TestMockImageRefreshRequest, SuccessChild) { expect_get_metadata(mock_image_ctx, mock_get_metadata_request, RBD_INFO, {}, 0); expect_apply_metadata(mock_image_ctx, 0); - expect_get_op_features(mock_image_ctx, RBD_OPERATION_FEATURE_CLONE_CHILD, 0); expect_get_group(mock_image_ctx, 0); expect_refresh_parent_is_required(*mock_refresh_parent_request, true); expect_refresh_parent_send(mock_image_ctx, *mock_refresh_parent_request, 0); @@ -892,8 +893,10 @@ TEST_F(TestMockImageRefreshRequest, SuccessChildDontOpenParent) { expect_op_work_queue(mock_image_ctx); expect_test_features(mock_image_ctx); + mock_image_ctx.features &= ~RBD_FEATURE_OPERATIONS; + InSequence seq; - expect_get_mutable_metadata(mock_image_ctx, ictx2->features, 0); + expect_get_mutable_metadata(mock_image_ctx, mock_image_ctx.features, 0); expect_get_parent(mock_image_ctx, 0); MockGetMetadataRequest mock_get_metadata_request; expect_get_metadata(mock_image_ctx, mock_get_metadata_request, @@ -901,7 +904,6 @@ TEST_F(TestMockImageRefreshRequest, SuccessChildDontOpenParent) { expect_get_metadata(mock_image_ctx, mock_get_metadata_request, RBD_INFO, {}, 0); expect_apply_metadata(mock_image_ctx, 0); - expect_get_op_features(mock_image_ctx, RBD_OPERATION_FEATURE_CLONE_CHILD, 0); expect_get_group(mock_image_ctx, 0); if (ictx->test_features(RBD_FEATURE_EXCLUSIVE_LOCK)) { expect_init_exclusive_lock(mock_image_ctx, mock_exclusive_lock, 0); -- 2.47.3