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>
(Imported from commit 0ae3d009f36066c794e6f39c6dd45735e706df34)

diff --git a/tests/scripts/integration.bash b/tests/scripts/integration.bash
index c014a1193e32bc95c758b2aa6f727860e15c649e..39aeb14d7473467aa5493de0c3d2b49585480023 100644 (file)
--- a/tests/scripts/integration.bash
+++ b/tests/scripts/integration.bash
@@ -508,7 +508,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"