From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 5 Dec 2019 22:08:44 +0000 (-0500)
Subject: test/rgw: unittest_rgw_reshard_wait uses spawn library
X-Git-Tag: v14.2.22~22^2~5^2~1^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91a3bb153e16f9ba619805e2f21124400152b6d6;p=ceph.git

test/rgw: unittest_rgw_reshard_wait uses spawn library

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 069dd7af3923cded76cbbd96f4b1020397ea6f11)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
---

diff --git a/src/test/rgw/test_rgw_reshard_wait.cc b/src/test/rgw/test_rgw_reshard_wait.cc
index e63f066d08a3..5895d4ba155d 100644
--- a/src/test/rgw/test_rgw_reshard_wait.cc
+++ b/src/test/rgw/test_rgw_reshard_wait.cc
@@ -13,6 +13,7 @@
  */
 
 #include "rgw/rgw_reshard.h"
+#include <spawn/spawn.hpp>
 
 #include <gtest/gtest.h>
 
@@ -64,7 +65,7 @@ TEST(ReshardWait, wait_yield)
   RGWReshardWait waiter(wait_duration);
 
   boost::asio::io_context context;
-  boost::asio::spawn(context, [&] (boost::asio::yield_context yield) {
+  spawn::spawn(context, [&] (spawn::yield_context yield) {
       EXPECT_EQ(0, waiter.wait(optional_yield{context, yield}));
     });
 
@@ -89,8 +90,8 @@ TEST(ReshardWait, stop_yield)
   RGWReshardWait short_waiter(short_duration);
 
   boost::asio::io_context context;
-  boost::asio::spawn(context,
-    [&] (boost::asio::yield_context yield) {
+  spawn::spawn(context,
+    [&] (spawn::yield_context yield) {
       EXPECT_EQ(-ECANCELED, long_waiter.wait(optional_yield{context, yield}));
     });
 
@@ -133,13 +134,13 @@ TEST(ReshardWait, stop_multiple)
   // spawn 4 coroutines
   boost::asio::io_context context;
   {
-    auto async_waiter = [&] (boost::asio::yield_context yield) {
+    auto async_waiter = [&] (spawn::yield_context yield) {
         EXPECT_EQ(-ECANCELED, long_waiter.wait(optional_yield{context, yield}));
       };
-    boost::asio::spawn(context, async_waiter);
-    boost::asio::spawn(context, async_waiter);
-    boost::asio::spawn(context, async_waiter);
-    boost::asio::spawn(context, async_waiter);
+    spawn::spawn(context, async_waiter);
+    spawn::spawn(context, async_waiter);
+    spawn::spawn(context, async_waiter);
+    spawn::spawn(context, async_waiter);
   }
 
   const auto start = Clock::now();