update sources to v12.1.2

[ceph.git] / ceph / src / test / test_pidfile.sh

diff --git a/ceph/src/test/test_pidfile.sh b/ceph/src/test/test_pidfile.sh
index 3fd003239be10ce88945117e61660db0ac0c7b0a..fbd5ab617d9d090433fbb226376d0fab501044fe 100755 (executable)
--- a/ceph/src/test/test_pidfile.sh
+++ b/ceph/src/test/test_pidfile.sh
@@ -6,7 +6,7 @@
 
 # Includes
 source $(dirname $0)/detect-build-env-vars.sh
-source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
+source $CEPH_ROOT/qa/standalone/ceph-helpers.sh
 
 function run() {
     local dir=$1
@@ -33,6 +33,7 @@ function TEST_without_pidfile() {
         --mkfs \
         --mon-data=$data \
         --run-dir=$dir || return 1
+    sleep 1
     expect_failure $dir "ignore empty --pid-file" ceph-mon \
         -f \
         --log-to-stderr \
@@ -49,10 +50,10 @@ function TEST_pidfile() {
 
     # no daemon can use a pidfile that is owned by another daemon
     run_mon $dir a || return 1
-    run_mon $dir a 2>&1 | grep "failed to lock pidfile" || return 1
+    run_mon $dir a --log-to-stderr -f 2>&1 | grep "failed to lock pidfile" || return 1
 
     run_osd $dir 0 || return 1
-    run_osd $dir 0 2>&1 | grep "failed to lock pidfile" || return 1
+    activate_osd $dir 0 --log-to-stderr -f 2>&1 | grep "failed to lock pidfile" || return 1
 
     # when a daemon shutdown, it will not unlink a path different from
     # the one it owns