X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fbin%2Fmemrm.cpp;h=9c8d382c90ca65ccaacf539f36f069bfdfa0ffa8;hb=6e732f43b86a64b49fbb02d2b5da1a1a1152ddb9;hp=b4a7fd0126c644352ed91e7725fd58ad7a2684a3;hpb=cd7d49d55430dae18dff248f26619f6b1a4fca3a;p=awesomized%2Flibmemcached

diff --git a/test/tests/bin/memrm.cpp b/test/tests/bin/memrm.cpp
index b4a7fd01..9c8d382c 100644
--- a/test/tests/bin/memrm.cpp
+++ b/test/tests/bin/memrm.cpp
@@ -12,19 +12,19 @@ TEST_CASE("bin/memrm") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memrm", output));
-    REQUIRE(output == "No Servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memrm --help", output));
-    REQUIRE_THAT(output, Contains("memrm"));
-    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("memrm v1"));
+    REQUIRE_THAT(output, Contains("Usage:"));
+    REQUIRE_THAT(output, Contains("key [key ...]"));
+    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") {
@@ -40,8 +40,9 @@ TEST_CASE("bin/memrm") {
 
     SECTION("not found") {
       string output;
-      REQUIRE(sh.run(comm + "-v key1", output));
-      REQUIRE_THAT(output, Contains("Could not find key \"key1\""));
+      REQUIRE_FALSE(sh.run(comm + "-v key1", output));
+      REQUIRE_THAT(output, Contains("Could not find key 'key1'"));
+      REQUIRE_THAT(output, Contains("NOT FOUND"));
     }
 
     SECTION("okay") {
@@ -69,7 +70,11 @@ TEST_CASE("bin/memrm") {
 
       string output;
       REQUIRE_FALSE(sh.run(comm + " -v key2", 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"));
     }
   }
 }