From 1619bcf08fe7c9eec79f7ce96830bbbdfbbab546 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Wed, 9 Jan 2019 11:49:41 +0000 Subject: [PATCH] test/rbd_mirror: fix gmock warnings when running with debug Signed-off-by: Mykola Golub --- src/test/rbd_mirror/test_mock_ImageReplayer.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc index d9ed376a78873..c7439d4bc6580 100644 --- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc @@ -527,6 +527,12 @@ public: .WillRepeatedly(Return(0)); } + void expect_get_tag_tid_in_debug(librbd::MockTestJournal &mock_journal) { + // It is used in debug messages and depends on debug level + EXPECT_CALL(mock_journal, get_tag_tid()).Times(AtLeast(0)) + .WillRepeatedly(Return(0)); + } + void expect_committed(::journal::MockJournaler &mock_journaler, int times) { EXPECT_CALL(mock_journaler, committed( MatcherCast(_))) @@ -1026,6 +1032,7 @@ TEST_F(TestMockImageReplayer, Replay) { expect_get_or_send_update(mock_replay_status_formatter); expect_get_commit_tid_in_debug(mock_replay_entry); + expect_get_tag_tid_in_debug(mock_local_journal); expect_committed(mock_remote_journaler, 2); InSequence seq; @@ -1134,6 +1141,7 @@ TEST_F(TestMockImageReplayer, DecodeError) { expect_get_or_send_update(mock_replay_status_formatter); expect_get_commit_tid_in_debug(mock_replay_entry); + expect_get_tag_tid_in_debug(mock_local_journal); InSequence seq; expect_send(mock_prepare_local_image_request, mock_local_image_ctx.id, @@ -1234,6 +1242,7 @@ TEST_F(TestMockImageReplayer, DelayedReplay) { expect_get_or_send_update(mock_replay_status_formatter); expect_get_commit_tid_in_debug(mock_replay_entry); + expect_get_tag_tid_in_debug(mock_local_journal); expect_committed(mock_remote_journaler, 1); InSequence seq; -- 2.39.5