ci: gh-actions: consolidate gitter notify

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

diff --git a/test/tests/bin/memflush.cpp b/test/tests/bin/memflush.cpp
index 27083c249250eb01f75d5b36e3926239073f15e1..1b29b9d99569224765ca11de1443bcec626652df 100644 (file)
--- a/test/tests/bin/memflush.cpp
+++ b/test/tests/bin/memflush.cpp
@@ -12,19 +12,19 @@ TEST_CASE("bin/memflush") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memflush", output));
-    REQUIRE(output == "No Servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memflush --help", output));
-    REQUIRE_THAT(output, Contains("memflush"));
-    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("memflush v1"));
+    REQUIRE_THAT(output, Contains("Usage:"));
+    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 +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"));
     }
   }
 }