summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2012-03-16 19:08:09 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2012-03-16 19:08:09 +0000
commit358b3ce26b916e53ab83ff9ea3452ec062c0191c (patch)
tree41787d383f11e3bb0058c6e0f21c0f0e85d4bc5c /test
parentd837eebdccf48e0737ca4a1f3a26c18924ef8f04 (diff)
downloadlvm2-358b3ce26b916e53ab83ff9ea3452ec062c0191c.tar.gz
lvm2-358b3ce26b916e53ab83ff9ea3452ec062c0191c.tar.xz
lvm2-358b3ce26b916e53ab83ff9ea3452ec062c0191c.zip
Longer sleep after clvmd start
Diffstat (limited to 'test')
-rw-r--r--test/lib/aux.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 0210c567..9be00510 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -36,7 +36,7 @@ prepare_clvmd() {
test -z "$LVM_VALGRIND_CLVMD" || run_valgrind="run_valgrind"
$run_valgrind lib/clvmd -Isinglenode -d 1 -f &
local local_clvmd=$!
- sleep .1
+ sleep .3
# extra sleep for slow valgrind
test -z "$LVM_VALGRIND_CLVMD" || sleep 5
# check that it is really running now
@@ -176,7 +176,7 @@ teardown() {
kill -INT "$(cat LOCAL_CLVMD)"
test -z "$LVM_VALGRIND_CLVMD" || sleep 1
sleep .1
- kill -9 "$(cat LOCAL_CLVMD)" || true
+ kill -9 "$(cat LOCAL_CLVMD)" &>/dev/null || true
}
echo -n .
@@ -288,7 +288,7 @@ prepare_scsi_debug_dev() {
}
cleanup_scsi_debug_dev() {
- aux teardown_devs
+ teardown_devs
rm -f SCSI_DEBUG_DEV LOOP
}