Make the lock test a little bit better...

diff --git a/test/t-lock-blocking.sh b/test/t-lock-blocking.sh
index a486d5a90b67cb932bdfa0341981ffe4527ab152..2bdd7f3c45ed7b2d63455ab73ec8eb0bdf47427b 100644 (file)
--- a/test/t-lock-blocking.sh
+++ b/test/t-lock-blocking.sh
@@ -21,17 +21,21 @@ vgcreate $vg $dev1 $dev2
 # if wait_for_locks set, vgremove should wait for orphan lock
 # flock process should have exited by the time first vgremove completes
 flock -w 5 $TESTDIR/var/lock/lvm/P_orphans -c "sleep 10" &
-flock_pid=`jobs -p`
+while ! test -f $TESTDIR/var/lock/lvm/P_orphans ; do sleep .1 ; done
+
 vgremove --config 'global { wait_for_locks = 1 }' $vg
 not vgremove --config 'global { wait_for_locks = 1 }' $vg
-sleep .2 # leave some time for scheduler to exit flock process
-not ps $flock_pid # finished
+
+test ! -f $TESTDIR/var/lock/lvm/P_orphans
 
 # if wait_for_locks not set, vgremove should fail on non-blocking lock
 # we must wait for flock process at the end - vgremove won't wait
 vgcreate $vg $dev1 $dev2
 flock -w 5 $TESTDIR/var/lock/lvm/P_orphans -c "sleep 10" &
+
+while ! test -f $TESTDIR/var/lock/lvm/P_orphans ; do sleep .1 ; done
 flock_pid=`jobs -p`
+
 not vgremove --config 'global { wait_for_locks = 0 }' $vg
-ps $flock_pid # still running
+test -f $TESTDIR/var/lock/lvm/P_orphans # still running
 kill $flock_pid