X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fbin%2Fmemcp.cpp;h=83fe974969b25d1debc975a36833415b7f513c9b;hb=2dd79b61ec7944b82ec6b576cc081603ec526049;hp=bbf796a6156ad538f47189516f2384e84d72f3ba;hpb=9f262c9ea92d4869715ca6f534c80075a8310ac1;p=m6w6%2Flibmemcached

diff --git a/test/tests/bin/memcp.cpp b/test/tests/bin/memcp.cpp
index bbf796a6..83fe9749 100644
--- a/test/tests/bin/memcp.cpp
+++ b/test/tests/bin/memcp.cpp
@@ -32,8 +32,7 @@ TEST_CASE("bin/memcp") {
     MemcachedPtr memc;
     LoneReturnMatcher test{*memc};
 
-    server.start();
-    Retry{[&server] { return server.isListening(); }}();
+    REQUIRE(server.ensureListening());
     auto port = get<int>(server.getSocketOrPort());
     auto comm = "memcp --servers=localhost:" + to_string(port) + " ";
 
@@ -64,7 +63,11 @@ TEST_CASE("bin/memcp") {
 
       string output;
       REQUIRE_FALSE(sh.run(comm + temp.getFn(), output));
-      REQUIRE_THAT(output, Contains("CONNECTION FAILURE"));
+      REQUIRE_THAT(output,
+              Contains("CONNECTION FAILURE")
+          ||  Contains("SERVER HAS FAILED")
+          ||  Contains("SYSTEM ERROR")
+          ||  Contains("TIMEOUT OCCURRED"));
     }
 
     SECTION("file not found") {