X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fbin%2Fmemping.cpp;h=5a74337a437653f6b0d003afea13e5492175fad1;hb=b4ef76f170b50709d127a00199e6cfa255b65be9;hp=ab56fa126abdddeb014f5fea4445e0b84a983f68;hpb=cd7d49d55430dae18dff248f26619f6b1a4fca3a;p=awesomized%2Flibmemcached

diff --git a/test/tests/bin/memping.cpp b/test/tests/bin/memping.cpp
index ab56fa12..5a74337a 100644
--- a/test/tests/bin/memping.cpp
+++ b/test/tests/bin/memping.cpp
@@ -11,19 +11,19 @@ TEST_CASE("bin/memping") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memping", output));
-    REQUIRE(output == "No Servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memping --help", output));
-    REQUIRE_THAT(output, Contains("memping"));
-    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("memping 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") {
@@ -49,7 +49,11 @@ TEST_CASE("bin/memping") {
 
       string output;
       REQUIRE_FALSE(sh.run(comm, 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"));
     }
   }
 }