travis: kill memcached

[m6w6/libmemcached] / testing / tests / bin / memdump.cpp

diff --git a/testing/tests/bin/memdump.cpp b/testing/tests/bin/memdump.cpp
index fe3023350243afe875687965be0a01e9aac1c6da..0fa084d754c35033a066143499e85f71ed2f2178 100644 (file)
--- a/testing/tests/bin/memdump.cpp
+++ b/testing/tests/bin/memdump.cpp
@@ -6,7 +6,7 @@
 
 using Catch::Matchers::Contains;
 
-TEST_CASE("memdump") {
+TEST_CASE("bin/memdump") {
   Shell sh{string{TESTING_ROOT "/../src/bin"}};
 
   SECTION("no servers provided") {
@@ -28,7 +28,7 @@ TEST_CASE("memdump") {
   }
 
   SECTION("with server") {
-    Server server{"memcached"};
+    Server server{MEMCACHED_BINARY, {"-p", random_port_string}};
     MemcachedPtr memc;
     LoneReturnMatcher test{*memc};
 
@@ -44,6 +44,8 @@ TEST_CASE("memdump") {
       REQUIRE_SUCCESS(memcached_set(*memc, S("key1"), S("val1"), 0, 0));
       REQUIRE_SUCCESS(memcached_set(*memc, S("key2"), S("val2"), 0, 0));
 
+      this_thread::sleep_for(500ms);
+
       string output;
       REQUIRE(sh.run(comm, output));
       REQUIRE_THAT(output, Contains("key1") && Contains("key2"));
@@ -51,6 +53,7 @@ TEST_CASE("memdump") {
 
     SECTION("connection failure") {
       server.signal(SIGKILL);
+      server.wait();
 
       string output;
       REQUIRE_FALSE(sh.run(comm + "-v", output));