From e25b57e018880630a4701b0ff86a3638e873be36 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 17 Jun 2020 16:09:17 -0400 Subject: [PATCH] test/librbd: fixed gmock warnings for get_parent_overlap calls Signed-off-by: Jason Dillaman --- src/test/librbd/io/test_mock_CopyupRequest.cc | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/test/librbd/io/test_mock_CopyupRequest.cc b/src/test/librbd/io/test_mock_CopyupRequest.cc index 6bb9294bec8d5..96a08615161da 100644 --- a/src/test/librbd/io/test_mock_CopyupRequest.cc +++ b/src/test/librbd/io/test_mock_CopyupRequest.cc @@ -175,23 +175,19 @@ struct TestMockIoCopyupRequest : public TestMockFixture { void expect_get_parent_overlap(MockTestImageCtx& mock_image_ctx, librados::snap_t snap_id, uint64_t overlap, int r) { - if (mock_image_ctx.object_map != nullptr) { - EXPECT_CALL(mock_image_ctx, get_parent_overlap(snap_id, _)) - .WillOnce(WithArg<1>(Invoke([overlap, r](uint64_t *o) { - *o = overlap; - return r; - }))); - } + EXPECT_CALL(mock_image_ctx, get_parent_overlap(snap_id, _)) + .WillOnce(WithArg<1>(Invoke([overlap, r](uint64_t *o) { + *o = overlap; + return r; + }))); } void expect_prune_parent_extents(MockTestImageCtx& mock_image_ctx, uint64_t overlap, uint64_t object_overlap) { - if (mock_image_ctx.object_map != nullptr) { - EXPECT_CALL(mock_image_ctx, prune_parent_extents(_, overlap)) - .WillOnce(WithoutArgs(Invoke([object_overlap]() { - return object_overlap; - }))); - } + EXPECT_CALL(mock_image_ctx, prune_parent_extents(_, overlap)) + .WillOnce(WithoutArgs(Invoke([object_overlap]() { + return object_overlap; + }))); } void expect_read_parent(MockTestImageCtx& mock_image_ctx, -- 2.39.5