From: Gui Hecheng <guihecheng@cmss.chinamobile.com>
Date: Thu, 23 Feb 2017 09:17:15 +0000 (+0800)
Subject: test/librbd: skip expect object request send when skip_partial_discard on
X-Git-Tag: v12.0.1~250^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f42f6cf66a5ebcfe833eabbb373b67b613684839;p=ceph.git

test/librbd: skip expect object request send when skip_partial_discard on

With skip_partial_discard on, there may be no object request send calls,
because they are skipped.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
---

diff --git a/src/test/librbd/io/test_mock_ImageRequest.cc b/src/test/librbd/io/test_mock_ImageRequest.cc
index 3cb0ffcc5c31..3a5d2fee3732 100644
--- a/src/test/librbd/io/test_mock_ImageRequest.cc
+++ b/src/test/librbd/io/test_mock_ImageRequest.cc
@@ -241,7 +241,9 @@ TEST_F(TestMockIoImageRequest, AioDiscardJournalAppendDisabled) {
 
   InSequence seq;
   expect_is_journal_appending(mock_journal, false);
-  expect_object_request_send(mock_image_ctx, mock_aio_object_request, 0);
+  if (!ictx->skip_partial_discard) {
+    expect_object_request_send(mock_image_ctx, mock_aio_object_request, 0);
+  }
 
   C_SaferCond aio_comp_ctx;
   AioCompletion *aio_comp = AioCompletion::create_and_start(