Merge in version/etc libtest

[awesomized/libmemcached] / libtest / memcached.cc

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index 910ea809396dc2ad5476702cefe882cc5ecc5426..1344c61854acddb513591949f400d74827c9796f 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -49,11 +49,11 @@ using namespace libtest;
 
 using namespace libtest;
 
-class Memcached : public Server
+class Memcached : public libtest::Server
 {
 public:
   Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg) :
-    Server(host_arg, port_arg, is_socket_arg)
+    libtest::Server(host_arg, port_arg, is_socket_arg)
   { }
 
   pid_t get_pid(bool error_is_ok)
@@ -161,6 +161,11 @@ public:
     return false;
   }
 
+  bool broken_socket_cleanup()
+  {
+    return true;
+  }
+
   // Memcached's pidfile is broken
   bool broken_pid_file()
   {
@@ -198,12 +203,12 @@ bool Memcached::build(int argc, const char *argv[])
 
 namespace libtest {
 
-Server *build_memcached(const std::string& hostname, const in_port_t try_port)
+libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port)
 {
   return new Memcached(hostname, try_port, false);
 }
 
-Server *build_memcached_socket(const std::string& hostname, const in_port_t try_port)
+libtest::Server *build_memcached_socket(const std::string& hostname, const in_port_t try_port)
 {
   return new Memcached(hostname, try_port, true);
 }