diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-11-23 23:17:54 +0100 |
---|---|---|
committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-11-24 11:29:28 +0100 |
commit | 8d86c5db03acd0b74cd919f1deb6cbfd1ff86e80 (patch) | |
tree | 3643246386085d78a8426223b9a968ae2f5a9c06 | |
parent | a220939d9ef77db63a1f6af5f3798573f047ab03 (diff) | |
download | lvm2-8d86c5db03acd0b74cd919f1deb6cbfd1ff86e80.tar.gz |
tests: improve teardown
Do not try to execute vgremove, when test has left suspended devices.
-rw-r--r-- | test/lib/aux.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 2c66f290b..216dd1950 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -322,8 +322,12 @@ teardown() { dm_table | not egrep -q "$vg|$vg1|$vg2|$vg3|$vg4" || { # Avoid activation of dmeventd if there is no pid cfg=$(test -s LOCAL_DMEVENTD || echo "--config activation{monitoring=0}") - vgremove -ff $cfg \ + if echo "$(dm_info suspended,name)" | grep -q "^Suspended:.*$prefix" ; then + echo "Skipping vgremove, suspended devices detected." + else + vgremove -ff $cfg \ $vg $vg1 $vg2 $vg3 $vg4 &>/dev/null || rm -f debug.log strace.log + fi } kill_sleep_kill_ LOCAL_LVMPOLLD ${LVM_VALGRIND_LVMPOLLD:-0} |