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

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