prepare v1.1.4

[awesomized/libmemcached] / test / lib / Cluster.hpp

diff --git a/test/lib/Cluster.hpp b/test/lib/Cluster.hpp
index c99e1d377ceca6248f68ef72b10d96727f312e23..ab20108c17d447a50532209c53a4b22fa2e75043 100644 (file)
--- a/test/lib/Cluster.hpp
+++ b/test/lib/Cluster.hpp
@@ -20,8 +20,7 @@
 
 class Cluster {
 public:
-  explicit Cluster(Server serv, uint16_t cnt = 0);
-  explicit Cluster(vector<Server> servers);
+  explicit Cluster(Server serv, size_t cnt = 3);
   ~Cluster();
 
   Cluster(const Cluster &c) = delete;
@@ -42,9 +41,10 @@ public:
   const vector<Server> &getServers() const;
 
   bool start();
-  void stop();
+  void stop(bool graceful = false);
   bool isStopped();
-  bool isListening();
+  bool isListening() const;
+  bool ensureListening();
   void wait();
   bool restart();
 
@@ -53,6 +53,4 @@ private:
   Server proto;
   vector<Server> cluster;
   map<pid_t, Server *> pids;
-
-  bool startServer(Server &server);
 };