summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2015-04-24 11:12:55 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2015-04-25 00:39:43 +0200
commitd7888e83169ac1a7a962ffd66502995792879244 (patch)
tree615d26db7a4efa21ba4e0f0a2b4debd2d9c687fc
parent066d0a4e1949afac055a7dc92bedd0f45f519124 (diff)
downloadlvm2-d7888e83169ac1a7a962ffd66502995792879244.tar.gz
tests: try more advanced clean
When test is executed on real device - lets try a more complete cleanup - discard whole device first and try to wipe any headers it might be left from previous test.
-rw-r--r--test/lib/aux.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 4e6961a49..cc3718cd0 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -431,7 +431,8 @@ prepare_devs() {
# non-ephemeral devices need to be cleared between tests
test -f LOOP || for d in ${DEVICES[@]}; do
- dd if=/dev/zero of=$d bs=64K count=1
+ blkdiscard "$d" 2>/dev/null || true
+ wipefs -a "$d" 2>/dev/null || dd if=/dev/zero of="$d" bs=64K count=1
done
#for i in `seq 1 $n`; do