release 1.1.0-beta1

[awesomized/libmemcached] / test / lib / MemcachedCluster.cpp

diff --git a/test/lib/MemcachedCluster.cpp b/test/lib/MemcachedCluster.cpp
index f94e86ca80d276534ff6164ec4ac274fa98ecb99..a443360b52b9b3082dcfb1d102e39098098bd048 100644 (file)
--- a/test/lib/MemcachedCluster.cpp
+++ b/test/lib/MemcachedCluster.cpp
@@ -6,13 +6,8 @@ const memcached_st MemcachedCluster::empty_memc{};
 void MemcachedCluster::init() {
   REQUIRE(cluster.start());
 
-  Retry cluster_is_listening([this]() {
-    return cluster.isListening();
-  });
-  while (!cluster_is_listening()) {
-    cluster.stop();
-    cluster.wait();
-    cluster.start();
+  while (!cluster.ensureListening()) {
+    cluster.restart();
   }
 
   if (auto br = getenv_else("MEMCACHED_BREAK", "0")) {
@@ -80,7 +75,7 @@ MemcachedCluster::MemcachedCluster(MemcachedCluster &&mc) noexcept
 MemcachedCluster &MemcachedCluster::operator=(MemcachedCluster &&mc) noexcept {
   cluster = move(mc.cluster);
   memcached_clone(&memc, &mc.memc);
-  returns = ReturnMatcher{&memc};
+  returns = &memc;
   return *this;
 }