bin: consolidate clients

[awesomized/libmemcached] / test / tests / bin / memdump.cpp

diff --git a/test/tests/bin/memdump.cpp b/test/tests/bin/memdump.cpp
index 8e4d4537f47df0c68bdbc81b8d5671f0237e0572..48cfa9906d6d9da805680f3c4aae95103d550e3c 100644 (file)
--- a/test/tests/bin/memdump.cpp
+++ b/test/tests/bin/memdump.cpp
@@ -12,19 +12,19 @@ TEST_CASE("bin/memdump") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memdump", output));
-    REQUIRE(output == "No Servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memdump --help", output));
-    REQUIRE_THAT(output, Contains("memdump"));
-    REQUIRE_THAT(output, Contains("v1"));
-    REQUIRE_THAT(output, Contains("help"));
-    REQUIRE_THAT(output, Contains("version"));
-    REQUIRE_THAT(output, Contains("option"));
-    REQUIRE_THAT(output, Contains("--"));
-    REQUIRE_THAT(output, Contains("="));
+    REQUIRE_THAT(output, Contains("memdump v1"));
+    REQUIRE_THAT(output, Contains("Usage:"));
+    REQUIRE_THAT(output, Contains("Options:"));
+    REQUIRE_THAT(output, Contains("-h|--help"));
+    REQUIRE_THAT(output, Contains("-V|--version"));
+    REQUIRE_THAT(output, Contains("Environment:"));
+    REQUIRE_THAT(output, Contains("MEMCACHED_SERVERS"));
   }
 
   SECTION("with server") {
@@ -32,8 +32,7 @@ TEST_CASE("bin/memdump") {
     MemcachedPtr memc;
     LoneReturnMatcher test{*memc};
 
-    server.start();
-    Retry{[&server] { return server.isListening(); }}();
+    REQUIRE(server.ensureListening());
     auto port = get<int>(server.getSocketOrPort());
     auto comm = "memdump --servers=localhost:" + to_string(port) + " ";
 
@@ -57,7 +56,11 @@ TEST_CASE("bin/memdump") {
 
       string output;
       REQUIRE_FALSE(sh.run(comm + "-v", output));
-      REQUIRE_THAT(output, Contains("CONNECTION FAILURE") || Contains("SERVER HAS FAILED"));
+      REQUIRE_THAT(output,
+              Contains("CONNECTION FAILURE")
+          ||  Contains("SERVER HAS FAILED")
+          ||  Contains("SYSTEM ERROR")
+          ||  Contains("TIMEOUT OCCURRED"));
     }
 
     SECTION("empty") {