tests: check also for /dev/loop/X

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/functions.sh b/tests/functions.sh
index d57d19d865cd5285429f31fa22e75dcfcf640066..371deb6aff9da9f9e6ac8eb4a9f28a84e5f5cb90 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -244,6 +244,17 @@ function ts_device_has_uuid {
        return $?
 }
 
+function ts_is_mounted {
+       local DEV=$1
+
+       grep -q $DEV /proc/mounts && return 0
+
+       if [ "${DEV#/dev/loop/}" != "$DEV" ]; then
+               return grep -q "/dev/loop${DEV#/dev/loop/}" /proc/mounts
+       fi
+       return 1
+}
+
 function ts_swapoff {
        local DEV="$1"
 

diff --git a/tests/ts-cramfs-mkfs b/tests/ts-cramfs-mkfs
index 4ed8114b6450970e135503f34bbd6855831d341a..651f4e342404149b95b0b93899d090c7a68e7714 100755 (executable)
--- a/tests/ts-cramfs-mkfs
+++ b/tests/ts-cramfs-mkfs
@@ -74,8 +74,7 @@ ts_log "mount the image"
 $TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 
 # check it
-grep -q $DEVICE /proc/mounts
-[ "$?" == "0" ] || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
 
 ts_log "list the image"
 ls -laR --time-style=long-iso $TS_MOUNTPOINT >> $TS_OUTPUT

diff --git a/tests/ts-fstab-devname b/tests/ts-fstab-devname
index b7eabd7f8f2eaf3df37a7b4c1c75efca12a92b68..87483afd2fd8e3b1e05c15fcf2b812dfb3596b76 100755 (executable)
--- a/tests/ts-fstab-devname
+++ b/tests/ts-fstab-devname
@@ -39,14 +39,12 @@ ts_fstab_add $DEVICE
 
 # variant A)
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-devname2label b/tests/ts-fstab-devname2label
index dda38a1dac336541f493e58272fb7a35c0d55a9b..575acaa73ea0f6b0db2db7d3b610a4426c851744 100755 (executable)
--- a/tests/ts-fstab-devname2label
+++ b/tests/ts-fstab-devname2label
@@ -41,7 +41,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \
 ts_fstab_add "LABEL=$LABEL"
 
 $TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-devname2uuid b/tests/ts-fstab-devname2uuid
index f9f62c89aaad11c20b8cb40fee1f2fe0cbc04d97..d6bf72b994e1aec6838d28d22387396ba9599cd1 100755 (executable)
--- a/tests/ts-fstab-devname2uuid
+++ b/tests/ts-fstab-devname2uuid
@@ -40,7 +40,7 @@ UUID=$(ts_uuid_by_devname $DEVICE)
 ts_fstab_add "UUID=$UUID"
 
 $TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-label b/tests/ts-fstab-label
index ac5ad1302f21d016ea192ac9fe537e7cc8f0d4fa..d47fbb16ea9063aa05f5cc5728a4a063cc7618db 100755 (executable)
--- a/tests/ts-fstab-label
+++ b/tests/ts-fstab-label
@@ -44,19 +44,17 @@ ts_fstab_add "LABEL=$LABEL"
 
 # variant A)
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 # variant C)
 $TS_CMD_MOUNT LABEL=$LABEL 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-label2devname b/tests/ts-fstab-label2devname
index eb58c25cd55019a09b9f00117cd931a3ea4dcf9e..a6e1e7a976f2135133044295e1040aa9752db61e 100755 (executable)
--- a/tests/ts-fstab-label2devname
+++ b/tests/ts-fstab-label2devname
@@ -44,14 +44,12 @@ ts_fstab_add "$DEVICE"
 
 # variant A)
 $TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-label2uuid b/tests/ts-fstab-label2uuid
index 7eaed4e3c25d50d67e02ac480a5192134ab1a197..18960164d32c890c91605c27b0dd07e9d2e27627 100755 (executable)
--- a/tests/ts-fstab-label2uuid
+++ b/tests/ts-fstab-label2uuid
@@ -48,14 +48,12 @@ ts_fstab_add "UUID=$UUID"
 
 # variant A)
 $TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-symlink b/tests/ts-fstab-symlink
index 5722d2c3b9c0d9aa32f5316952f9e01292788f80..336ecdba6344b1555ad961e209f5937bf25d96dd 100755 (executable)
--- a/tests/ts-fstab-symlink
+++ b/tests/ts-fstab-symlink
@@ -43,8 +43,7 @@ ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user"
 
 # variant A) -- UID=0
 $TS_CMD_MOUNT $LINKNAME 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" $DEVICE
 
 # varian B)
@@ -52,8 +51,7 @@ ts_init_suid $TS_CMD_MOUNT
 ts_init_suid $TS_CMD_UMOUNT
 
 su $TS_TESTUSER -c "$TS_CMD_MOUNT $LINKNAME" 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" 2>&1 >> $TS_OUTPUT \
  || ts_die "B) Cannot umount $LINKNAME" $DEVICE
 

diff --git a/tests/ts-fstab-uuid b/tests/ts-fstab-uuid
index ff39a5f80c42364d57f348ff23da04b9605de6a9..bdd56d7725846593c5c8b493541897b9efedb54d 100755 (executable)
--- a/tests/ts-fstab-uuid
+++ b/tests/ts-fstab-uuid
@@ -43,17 +43,17 @@ ts_fstab_add "UUID=$UUID"
 
 # varian A)
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # varian B)
 $TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 # varian C)
 $TS_CMD_MOUNT UUID=$UUID 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-uuid2devname b/tests/ts-fstab-uuid2devname
index 0c3e605f7e50dd16d5b0e3121e3066945493cc2b..5feac01cb43d04958e91a6fbad0b8ac3adbba7c5 100755 (executable)
--- a/tests/ts-fstab-uuid2devname
+++ b/tests/ts-fstab-uuid2devname
@@ -43,14 +43,12 @@ ts_fstab_add "$DEVICE"
 
 # variant A)
 $TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-fstab-uuid2label b/tests/ts-fstab-uuid2label
index b99323cca3bb48d52b9b8227f1b70a1cad38e958..fff28ef2fc5ae2458a2a7418e75a0549cd10262c 100755 (executable)
--- a/tests/ts-fstab-uuid2label
+++ b/tests/ts-fstab-uuid2label
@@ -48,13 +48,12 @@ ts_fstab_add "LABEL=$LABEL"
 
 # variant A)
 $TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-mount-devname b/tests/ts-mount-devname
index eceb5e91dfdf6e36a23fc752950a58ff6cb01fae..f0661f32abbd96cc89a9c59c9f7ec85048b07c69 100755 (executable)
--- a/tests/ts-mount-devname
+++ b/tests/ts-mount-devname
@@ -37,7 +37,7 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot found ext3 on $DEVICE" $DE
 
 $TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 
-grep -q $DEVICE /proc/mounts || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
 
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
 

diff --git a/tests/ts-mount-label b/tests/ts-mount-label
index eb6400420dd50d10d2c84b21bd2b0fcffa711e54..a5b28fa904bf94e62ed56f88a1af403d30fb8cdf 100755 (executable)
--- a/tests/ts-mount-label
+++ b/tests/ts-mount-label
@@ -43,14 +43,12 @@ ts_udev_dev_support "by-label" $LABEL \
 
 # variant A)
 $TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts \
- || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE

diff --git a/tests/ts-mount-uuid b/tests/ts-mount-uuid
index f8bd9a91e65bd52312c5d17b1c1e90aa6f3db2a9..ee186f079b17181bd46d96ccc51ff66ad1fd3931 100755 (executable)
--- a/tests/ts-mount-uuid
+++ b/tests/ts-mount-uuid
@@ -42,12 +42,12 @@ ts_udev_dev_support "by-uuid" $UUID \
 
 # variant A)
 $TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
 
 # variant B)
 $TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-grep -q $DEVICE /proc/mounts || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
 
 ts_device_deinit $DEVICE