X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fbin%2Fmemflush.cpp;h=b512b8e2c9b2afb424c52763a4cb2f744e483275;hb=52d10244d2cb8059106b483da7170a4c9acc3b0a;hp=27083c249250eb01f75d5b36e3926239073f15e1;hpb=9f262c9ea92d4869715ca6f534c80075a8310ac1;p=m6w6%2Flibmemcached

diff --git a/test/tests/bin/memflush.cpp b/test/tests/bin/memflush.cpp
index 27083c24..b512b8e2 100644
--- a/test/tests/bin/memflush.cpp
+++ b/test/tests/bin/memflush.cpp
@@ -32,8 +32,7 @@ TEST_CASE("bin/memflush") {
     MemcachedPtr memc;
     LoneReturnMatcher test{*memc};
 
-    server.start();
-    Retry{[&server] { return server.isListening(); }}();
+    REQUIRE(server.ensureListening());
     auto port = get<int>(server.getSocketOrPort());
     auto comm = "memflush --servers=localhost:" + to_string(port) + " ";
 
@@ -63,7 +62,11 @@ TEST_CASE("bin/memflush") {
 
       string output;
       REQUIRE_FALSE(sh.run(comm, 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"));
     }
   }
 }