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 06ebd5c58ac9169a29f2fae44564f3d0b76532bb..9ad6281697d34d71e44b13945177e2f08c32e485 100644 (file)
--- 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
 }