testing: check for pid in lib/Server::isListening()

[m6w6/libmemcached] / testing / lib / MemcachedCluster.cpp

diff --git a/testing/lib/MemcachedCluster.cpp b/testing/lib/MemcachedCluster.cpp
index 6b9af3e39e4672909f7152a87a159fc8a1c79ec6..efb1a2de60d74e5b13d1c6ee73637083e5d83f6c 100644 (file)
--- a/testing/lib/MemcachedCluster.cpp
+++ b/testing/lib/MemcachedCluster.cpp
@@ -34,7 +34,7 @@ void MemcachedCluster::flush() {
 
 MemcachedCluster::MemcachedCluster()
 : cluster{Server{
-  getenv_else("MEMCACHED_BINARY", "memcached"),
+  MEMCACHED_BINARY,
   {random_socket_or_port_arg()}
 }}
 {
@@ -53,14 +53,14 @@ MemcachedCluster MemcachedCluster::mixed() {
 
 MemcachedCluster MemcachedCluster::network() {
   return MemcachedCluster{Cluster{Server{
-    getenv_else("MEMCACHED_BINARY", "memcached"),
+    MEMCACHED_BINARY,
     {"-p", random_socket_or_port_string}
   }}};
 }
 
 MemcachedCluster MemcachedCluster::socket() {
   return MemcachedCluster{Cluster{Server{
-    getenv_else("MEMCACHED_BINARY", "memcached"),
+    MEMCACHED_BINARY,
     {"-s", random_socket_or_port_string}
   }}};
 }
@@ -82,30 +82,3 @@ MemcachedCluster &MemcachedCluster::operator=(MemcachedCluster &&mc) {
   returns = ReturnMatcher{&memc};
   return *this;
 }
-
-ReturnMatcher &ReturnMatcher::operator=(ReturnMatcher &&rm) {
-  memc = exchange(rm.memc, nullptr);
-  expected = rm.expected;
-  return *this;
-}
-
-bool ReturnMatcher::match(const memcached_return_t &arg) const {
-  return arg == expected;
-}
-
-ReturnMatcher ReturnMatcher::success() {
-  return ReturnMatcher{memc};
-}
-
-ReturnMatcher ReturnMatcher::operator()(memcached_return_t expected_) {
-  return ReturnMatcher{memc, expected_};
-}
-
-string ReturnMatcher::describe() const {
-  return "is " + to_string(expected)
-         + "\n  actual: " + memcached_last_error_message(memc);
-}
-
-ReturnMatcher::ReturnMatcher(ReturnMatcher &&rm) {
-  *this = move(rm);
-}