From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 19 May 2020 15:44:29 +0000 (-0400)
Subject: Merge pull request #35127 from ronen-fr/scrub4
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1234
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5e6ddf9ceee5ee450309bf7ce529ed96fc9d3d8;p=ceph-ci.git

Merge pull request #35127 from ronen-fr/scrub4

test/librbd, Crimson: remove some unused captures

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

a5e6ddf9ceee5ee450309bf7ce529ed96fc9d3d8
diff --cc src/test/librbd/cache/test_mock_ParentImageCache.cc
index 8ee85acd762,d2455fc1951..4d9aa7d4f60
--- a/src/test/librbd/cache/test_mock_ParentImageCache.cc
+++ b/src/test/librbd/cache/test_mock_ParentImageCache.cc
@@@ -133,9 -133,9 +133,9 @@@ class TestMockParentImageCache : publi
    void expect_io_object_dispatcher_register_state(MockParentImageCache& mparent_image_cache, 
                                                    int ret_val) {
      auto& expect = EXPECT_CALL((*(mparent_image_cache.get_image_ctx()->io_object_dispatcher)),
 -                               register_object_dispatch(_));
 +                               register_dispatch(_));
  
-         expect.WillOnce(WithArg<0>(Invoke([ret_val, &mparent_image_cache]
+         expect.WillOnce(WithArg<0>(Invoke([&mparent_image_cache]
                  (io::ObjectDispatchInterface* object_dispatch) {
            ASSERT_EQ(object_dispatch, &mparent_image_cache);
          })));