update sources to 12.2.2

[ceph.git] / ceph / src / test / rbd_mirror / test_mock_PoolWatcher.cc

diff --git a/ceph/src/test/rbd_mirror/test_mock_PoolWatcher.cc b/ceph/src/test/rbd_mirror/test_mock_PoolWatcher.cc
index 1b7877434ad96bb24a59fbd45bc5d0dd0d8bb8b1..4c7463d660c552df8e20ad29371c031f5035149e 100644 (file)
--- a/ceph/src/test/rbd_mirror/test_mock_PoolWatcher.cc
+++ b/ceph/src/test/rbd_mirror/test_mock_PoolWatcher.cc
@@ -145,6 +145,7 @@ using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Invoke;
 using ::testing::Return;
+using ::testing::ReturnArg;
 using ::testing::StrEq;
 using ::testing::WithArg;
 using ::testing::WithoutArgs;
@@ -238,13 +239,15 @@ public:
 
   void expect_timer_add_event(MockThreads &mock_threads) {
     EXPECT_CALL(*mock_threads.timer, add_event_after(_, _))
-      .WillOnce(WithArg<1>(Invoke([this](Context *ctx) {
-          auto wrapped_ctx = new FunctionContext([this, ctx](int r) {
-              Mutex::Locker timer_locker(m_threads->timer_lock);
-              ctx->complete(r);
-            });
-          m_threads->work_queue->queue(wrapped_ctx, 0);
-        })));
+      .WillOnce(DoAll(WithArg<1>(Invoke([this](Context *ctx) {
+                        auto wrapped_ctx =
+                         new FunctionContext([this, ctx](int r) {
+                             Mutex::Locker timer_locker(m_threads->timer_lock);
+                             ctx->complete(r);
+                           });
+                       m_threads->work_queue->queue(wrapped_ctx, 0);
+                      })),
+                      ReturnArg<1>()));
   }
 
   int when_shut_down(MockPoolWatcher &mock_pool_watcher) {