projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
testing: test lib/Connection
[m6w6/libmemcached]
/
test
/
tests
/
bin
/
memflush.cpp
diff --git
a/test/tests/bin/memflush.cpp
b/test/tests/bin/memflush.cpp
index 27083c249250eb01f75d5b36e3926239073f15e1..b512b8e2c9b2afb424c52763a4cb2f744e483275 100644
(file)
--- 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};
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) + " ";
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));
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"));
}
}
}
}
}
}