bin: consolidate clients

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

diff --git a/test/tests/bin/memcp.cpp b/test/tests/bin/memcp.cpp
index 9f891ccb0a01746ad9b53334413553c2097e3b35..c3fa788466461652b47a1d3a4438db62031a23d3 100644 (file)
--- a/test/tests/bin/memcp.cpp
+++ b/test/tests/bin/memcp.cpp
@@ -12,19 +12,20 @@ TEST_CASE("bin/memcp") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memcp nonexistent", output));
-    REQUIRE(output == "No Servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memcp --help", output));
-    REQUIRE_THAT(output, Contains("memcp"));
-    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("memcp v1"));
+    REQUIRE_THAT(output, Contains("Usage:"));
+    REQUIRE_THAT(output, Contains("file [file ...]"));
+    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") {
@@ -77,17 +78,14 @@ TEST_CASE("bin/memcp") {
         REQUIRE(output == "");
         REQUIRE(ok);
 
-        if (udp_buffer) {
-          memcached_quit(*memc);
-        }
-
-        size_t len;
-        memcached_return_t rc;
-        Malloced val(memcached_get(*memc, S(temp.getFn()), &len, nullptr, &rc));
+        Retry settled{[&memc, &temp]{
+          size_t len;
+          memcached_return_t rc;
+          Malloced val(memcached_get(*memc, S(temp.getFn()), &len, nullptr, &rc));
 
-        REQUIRE(*val);
-        REQUIRE_SUCCESS(rc);
-        REQUIRE(string(*val, len) == "123");
+          return MEMCACHED_SUCCESS == rc && *val && string(*val, len) == "123";
+        }};
+        REQUIRE(settled());
       }
     }