projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
| inline |
side by side
(parent:
36c2351
)
testing: report different server pid
author
Michael Wallner
<mike@php.net>
Tue, 29 Sep 2020 06:32:32 +0000
(08:32 +0200)
committer
Michael Wallner
<mike@php.net>
Tue, 29 Sep 2020 06:32:32 +0000
(08:32 +0200)
test/lib/Server.cpp
patch
|
blob
|
history
diff --git
a/test/lib/Server.cpp
b/test/lib/Server.cpp
index 17bafe74ca8a9c96441a21456010899635cfbf81..f31819e86ef8dfbc3fa99d9ded1335b34945d55c 100644
(file)
--- a/
test/lib/Server.cpp
+++ b/
test/lib/Server.cpp
@@
-130,7
+130,12
@@
bool Server::isListening() {
}
Malloced stat(memcached_stat(*memc, nullptr, nullptr));
- if (!*stat || !stat->pid || stat->pid != pid) {
+ if (!*stat || !stat->pid) {
+ return false;
+ }
+ if (stat->pid != pid) {
+ cerr << "Another server is listening on " << socket_or_port
+ << " (expected pid " << pid << " found pid " << stat->pid << ")\n";
return false;
}