X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fbin%2Fmemstat.cpp;h=05f935de2e4b476707bb56b663b60b452dc5a7c9;hb=fbb7de82d298d84c665ab465069fc6d925880e09;hp=87db31d4a9bc4d7f1f155c149b65afd028d57a7d;hpb=cd7d49d55430dae18dff248f26619f6b1a4fca3a;p=awesomized%2Flibmemcached

diff --git a/test/tests/bin/memstat.cpp b/test/tests/bin/memstat.cpp
index 87db31d4..05f935de 100644
--- a/test/tests/bin/memstat.cpp
+++ b/test/tests/bin/memstat.cpp
@@ -12,19 +12,20 @@ TEST_CASE("bin/memstat") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memstat", output));
-    REQUIRE(output == "No Servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memstat --help", output));
-    REQUIRE_THAT(output, Contains("memstat"));
-    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("memstat v1"));
+    REQUIRE_THAT(output, Contains("Usage:"));
+    REQUIRE_THAT(output, Contains("[stat ...]"));
+    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") {
@@ -40,6 +41,12 @@ TEST_CASE("bin/memstat") {
     REQUIRE_SUCCESS(memcached_server_add(*memc, "localhost", port));
 
     SECTION("okay") {
+      SECTION("stat") {
+        string output;
+        REQUIRE(sh.run(comm, output));
+        REQUIRE_THAT(output, Contains("Server:"));
+        REQUIRE_THAT(output, Contains("pid:"));
+      }
       SECTION("version") {
         REQUIRE_SUCCESS(memcached_version(*memc));
         auto inst = memcached_server_instance_by_position(*memc, 0);
@@ -56,6 +63,11 @@ TEST_CASE("bin/memstat") {
         REQUIRE(sh.run(comm + "--analyze", output));
         REQUIRE_THAT(output, Contains("Number of Servers Analyzed         : 2"));
       }
+      SECTION("analyze=latency") {
+        string output;
+        REQUIRE(sh.run(comm + "--analyze=latency", output));
+        REQUIRE_THAT(output, Contains("Network Latency Test:"));
+      }
     }
 
     SECTION("connection failure") {
@@ -64,7 +76,11 @@ TEST_CASE("bin/memstat") {
 
       string output;
       REQUIRE_FALSE(sh.run(comm + "--analyze", 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"));
     }
   }
 }