update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / test / rgw / test_rgw_throttle.cc

diff --git a/ceph/src/test/rgw/test_rgw_throttle.cc b/ceph/src/test/rgw/test_rgw_throttle.cc
index fff680012f4df02282a99037cd5760d6e6257b58..a762a8c7a06ca648cc123b94532cf4f95d1c25fc 100644 (file)
--- a/ceph/src/test/rgw/test_rgw_throttle.cc
+++ b/ceph/src/test/rgw/test_rgw_throttle.cc
@@ -18,9 +18,7 @@
 #include <thread>
 #include "include/scope_guard.h"
 
-#ifdef HAVE_BOOST_CONTEXT
 #include <spawn/spawn.hpp>
-#endif
 #include <gtest/gtest.h>
 
 struct RadosEnv : public ::testing::Environment {
@@ -31,7 +29,7 @@ struct RadosEnv : public ::testing::Environment {
 
   void SetUp() override {
     rados.emplace(g_ceph_context);
-    ASSERT_EQ(0, rados->start());
+    ASSERT_EQ(0, rados->start(null_yield));
     int r = rados->pool({poolname}).create();
     if (r == -EEXIST)
       r = 0;
@@ -166,7 +164,6 @@ TEST_F(Aio_Throttle, ThrottleOverMax)
   EXPECT_EQ(window, max_outstanding);
 }
 
-#ifdef HAVE_BOOST_CONTEXT
 TEST_F(Aio_Throttle, YieldCostOverWindow)
 {
   auto obj = make_obj(__PRETTY_FUNCTION__);
@@ -216,6 +213,5 @@ TEST_F(Aio_Throttle, YieldingThrottleOverMax)
   EXPECT_EQ(0u, outstanding);
   EXPECT_EQ(window, max_outstanding);
 }
-#endif // HAVE_BOOST_CONTEXT
 
 } // namespace rgw