code: fix EOF

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

diff --git a/test/tests/bin/memexist.cpp b/test/tests/bin/memexist.cpp
index 36d69c4f164565b43533d6e0004c075f0d81386a..26bf60d79d3088487eed1db05a955d5464646a16 100644 (file)
--- a/test/tests/bin/memexist.cpp
+++ b/test/tests/bin/memexist.cpp
@@ -12,19 +12,20 @@ TEST_CASE("bin/memexist") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memexist", output));
-    REQUIRE(output == "No Servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memexist --help", output));
-    REQUIRE_THAT(output, Contains("memexist"));
-    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("memexist v1"));
+    REQUIRE_THAT(output, Contains("Usage:"));
+    REQUIRE_THAT(output, Contains("key [key ...]"));
+    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 +33,7 @@ TEST_CASE("bin/memexist") {
     MemcachedPtr memc;
     LoneReturnMatcher test{*memc};
 
-    server.start();
-    Retry{[&server] { return server.isListening(); }}();
+    REQUIRE(server.ensureListening());
     auto port = get<int>(server.getSocketOrPort());
     auto comm = "memexist --servers=localhost:" + to_string(port) + " ";