From: Alasdair Kergon <agk@redhat.com>
Date: Wed, 29 Jun 2011 18:14:08 +0000 (+0000)
Subject: teardown aborts if it hits an error, so better teardown semaphores earlier
X-Git-Tag: v2_02_91~787
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=10e002742b0aa9b5b1506a67cf515ec7a3cf9753;p=lvm2.git

teardown aborts if it hits an error, so better teardown semaphores earlier
as we need them later in the teardown process
---

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 06ebd5c58..9ad628169 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -61,6 +61,9 @@ prepare_dmeventd() {
 }
 
 teardown_devs() {
+	# Delete any remaining dm/udev semaphores
+	dmsetup udevcomplete_all -y
+
 	test -n "$PREFIX" && {
 		rm -rf $TESTDIR/dev/$PREFIX*
 
@@ -87,9 +90,6 @@ teardown_devs() {
 	rm -f DEVICES # devs is set in prepare_devs()
 	rm -f LOOP
 
-	# Delete any remaining dm/udev semaphores
-	dmsetup udevcomplete_all -y
-
 	# Display any loop devices that failed to get torn down
 	losetup -a
 }