From: David Zafman <dzafman@redhat.com>
Date: Wed, 26 Jul 2017 01:39:56 +0000 (-0700)
Subject: test: Fixes for test_pidfile
X-Git-Tag: v12.1.2~87^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20fee153cada2ea7659199a009679f978cd8fce1;p=ceph.git

test: Fixes for test_pidfile

Add a short delay for one test
Fix test that had unreliable log output

Fixes: http://tracker.ceph.com/issues/20770

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/test/test_pidfile.sh b/src/test/test_pidfile.sh
index b76fa9b64a6e..31a3a582b4f1 100755
--- a/src/test/test_pidfile.sh
+++ b/src/test/test_pidfile.sh
@@ -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 \
@@ -52,7 +53,7 @@ function TEST_pidfile() {
     run_mon $dir a 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