From: Kefu Chai <kchai@redhat.com>
Date: Tue, 3 Mar 2020 04:01:58 +0000 (+0800)
Subject: test/rbd_mirror: do not capture unused variables
X-Git-Tag: v15.1.1~112^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06f3d56e9677a4d1e0e712e4ca5163bd3c5be4ac;p=ceph.git

test/rbd_mirror: do not capture unused variables

this silences warning from clang-11, like

```
../src/test/rbd_mirror/test_mock_ImageReplayer.cc:322:26: warning: lambda capture 'mock_replayer' is not used [-Wunused-lambda-capture]
      .WillOnce(Invoke([&mock_replayer, r](Context* ctx) {
                        ~^~~~~~~~~~~~~~
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc
index 049187fcf78b..8175680ab6c8 100644
--- a/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc
+++ b/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc
@@ -397,7 +397,7 @@ public:
   void expect_close_remote_image(
       MockStateBuilder& mock_state_builder, int r) {
     EXPECT_CALL(mock_state_builder, close_remote_image(_))
-      .WillOnce(Invoke([this, &mock_state_builder, r]
+      .WillOnce(Invoke([&mock_state_builder, r]
                        (Context* on_finish) {
           mock_state_builder.remote_image_ctx = nullptr;
           on_finish->complete(r);
@@ -409,7 +409,7 @@ public:
     EXPECT_CALL(mock_state_builder,
                 create_local_image_request(_, _, _, _, _, _))
       .WillOnce(WithArg<5>(
-        Invoke([this, &mock_state_builder, local_image_id, r](Context* ctx) {
+        Invoke([&mock_state_builder, local_image_id, r](Context* ctx) {
           if (r >= 0) {
             mock_state_builder.local_image_id = local_image_id;
           }
@@ -428,7 +428,7 @@ public:
     EXPECT_CALL(mock_state_builder,
                 create_prepare_replay_request(_, _, _, _, _))
       .WillOnce(WithArgs<2, 3, 4>(
-        Invoke([this, &mock_state_builder, resync_requested, syncing, r]
+        Invoke([&mock_state_builder, resync_requested, syncing, r]
                (bool* resync, bool* sync, Context* ctx) {
           if (r >= 0) {
             *resync = resync_requested;
diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
index 0f4579bbe8e6..653b6e98bb7c 100644
--- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
@@ -303,7 +303,7 @@ public:
                               MockReplayer& mock_replayer) {
     EXPECT_CALL(mock_state_builder, create_replayer(_, _, _, _))
       .WillOnce(WithArg<3>(
-        Invoke([this, &mock_replayer]
+        Invoke([&mock_replayer]
                (image_replayer::ReplayerListener* replayer_listener) {
           mock_replayer.replayer_listener = replayer_listener;
           return &mock_replayer;
@@ -319,14 +319,14 @@ public:
 
   void expect_init(MockReplayer& mock_replayer, int r) {
     EXPECT_CALL(mock_replayer, init(_))
-      .WillOnce(Invoke([this, &mock_replayer, r](Context* ctx) {
+      .WillOnce(Invoke([this, r](Context* ctx) {
                   m_threads->work_queue->queue(ctx, r);
                 }));
   }
 
   void expect_shut_down(MockReplayer& mock_replayer, int r) {
     EXPECT_CALL(mock_replayer, shut_down(_))
-      .WillOnce(Invoke([this, &mock_replayer, r](Context* ctx) {
+      .WillOnce(Invoke([this, r](Context* ctx) {
                   m_threads->work_queue->queue(ctx, r);
                 }));
     EXPECT_CALL(mock_replayer, destroy());