diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-11-14 20:36:52 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-11-27 18:46:17 +0100 |
| commit | 0ae3d009f36066c794e6f39c6dd45735e706df34 (patch) | |
| tree | f00fe35d700b21c65a47c2bc989240717196c368 | |
| parent | 2f5d9be754ba37ebc37e44da4e3b3a9207d3655d (diff) | |
| download | samba-0ae3d009f36066c794e6f39c6dd45735e706df34.tar.gz samba-0ae3d009f36066c794e6f39c6dd45735e706df34.tar.xz samba-0ae3d009f36066c794e6f39c6dd45735e706df34.zip | |
ctdb:tests/integration: Be more careful when killing ctdbd
Also match $TEST_VAR_DIR in the socket name. This means that we'll
only ever kill ctdbd process belong to our own test run.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 4f0f68b626..88161c1a2d 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -514,7 +514,7 @@ daemons_stop () echo "Sleeping for a while..." sleep_for 1 - local pat="ctdbd --socket=.* --nlist .* --nopublicipcheck" + local pat="ctdbd --socket=${TEST_VAR_DIR}/.* --nlist .* --nopublicipcheck" if pgrep -f "$pat" >/dev/null ; then echo "Killing remaining daemons..." pkill -f "$pat" |