From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 6 Aug 2020 11:15:26 +0000 (-0400)
Subject: crimson/test: adapt to the new interface of seastar::when_all_succeed().
X-Git-Tag: v16.1.0~1424^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed08faf2491897257dedd352fcdeb205575d98fb;p=ceph.git

crimson/test: adapt to the new interface of seastar::when_all_succeed().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc
index ad52ee39196d..43a0e688ee4b 100644
--- a/src/test/crimson/test_messenger.cc
+++ b/src/test/crimson/test_messenger.cc
@@ -232,12 +232,14 @@ static seastar::future<> test_echo(unsigned rounds,
       client1->init(entity_name_t::OSD(2), "client1", 3),
       client2->init(entity_name_t::OSD(3), "client2", 4)
   // dispatch pingpoing
-  ).then([client1, client2, server1, server2] {
+  ).then_unpack([client1, client2, server1, server2] {
     return seastar::when_all_succeed(
         // test connecting in parallel, accepting in parallel
         client1->dispatch_pingpong(server2->msgr->get_myaddr()),
         client2->dispatch_pingpong(server1->msgr->get_myaddr()));
   // shutdown
+  }).then_unpack([] {
+    return seastar::now();
   }).finally([client1] {
     logger().info("client1 shutdown...");
     return client1->shutdown();
@@ -333,7 +335,7 @@ static seastar::future<> test_concurrent_dispatch(bool v2)
   return seastar::when_all_succeed(
       server->init(entity_name_t::OSD(4), "server3", 5, addr),
       client->init(entity_name_t::OSD(5), "client3", 6)
-  ).then([server, client] {
+  ).then_unpack([server, client] {
     auto conn = client->msgr->connect(server->msgr->get_myaddr(),
                                       entity_name_t::TYPE_OSD);
     // send two messages
@@ -454,7 +456,7 @@ seastar::future<> test_preemptive_shutdown(bool v2) {
   return seastar::when_all_succeed(
     server->init(entity_name_t::OSD(6), "server4", 7, addr),
     client->init(entity_name_t::OSD(7), "client4", 8)
-  ).then([server, client] {
+  ).then_unpack([server, client] {
     client->send_pings(server->get_addr());
     return seastar::sleep(100ms);
   }).then([client] {
diff --git a/src/test/crimson/test_socket.cc b/src/test/crimson/test_socket.cc
index 1a99d9f49011..ffd8268642f5 100644
--- a/src/test/crimson/test_socket.cc
+++ b/src/test/crimson/test_socket.cc
@@ -153,6 +153,8 @@ class SocketFactory {
           });
         })
       );
+    }).then_unpack([] {
+      return seastar::now();
     }).then([psf] {
       return psf->server_connected.get_future();
     }).finally([psf] {
@@ -190,6 +192,8 @@ class SocketFactory {
           });
         })
       );
+    }).then_unpack([] {
+      return seastar::now();
     }).finally([cleanup = std::move(owner)] {});
   }
 };
@@ -332,7 +336,9 @@ class Connection {
       return seastar::when_all_succeed(
         conn.dispatch_write(round, force_shut),
         conn.dispatch_read(round, force_shut)
-      );
+      ).then_unpack([] {
+        return seastar::now();
+      });
     });
   }
 
@@ -352,7 +358,9 @@ class Connection {
             return seastar::now();
           }
         })
-      );
+      ).then_unpack([] {
+        return seastar::now();
+      });
     });
   }
 };