tests: add more variants to {mount,fstab}-by-{label,uuid,devname}
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
3af76c0b01
commit
e38e975265
|
@ -19,7 +19,7 @@
|
|||
. functions.sh
|
||||
|
||||
TS_COMPONENT="fstab"
|
||||
TS_DESC="label"
|
||||
TS_DESC="devname"
|
||||
|
||||
ts_init "$1"
|
||||
ts_skip_nonroot
|
||||
|
@ -29,7 +29,7 @@ set -o pipefail
|
|||
DEVICE=$(ts_device_init)
|
||||
[ "$?" == 0 ] || ts_die "Cannot init device"
|
||||
|
||||
mkfs.ext3 $DEVICE &> /dev/null
|
||||
mkfs.ext3 $DEVICE &> /dev/null
|
||||
[ "$?" == "0" ] || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
|
||||
|
||||
ts_device_has "TYPE" "ext3" $DEVICE
|
||||
|
@ -39,13 +39,19 @@ ts_device_has "TYPE" "ext3" $DEVICE
|
|||
|
||||
ts_fstab_add $DEVICE
|
||||
|
||||
# variant A)
|
||||
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
|
||||
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "Cannot umount $DEVICE" $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
# variant B)
|
||||
$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
ts_device_deinit $DEVICE
|
||||
ts_fstab_clean
|
||||
|
|
|
@ -44,13 +44,26 @@ ts_udev_dev_support "by-label" $LABEL
|
|||
|
||||
ts_fstab_add "LABEL=$LABEL"
|
||||
|
||||
# variant A)
|
||||
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
|
||||
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "Cannot umount $DEVICE" $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
# variant B)
|
||||
$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
# variant C)
|
||||
$TS_CMD_MOUNT LABEL=$LABEL 2>&1 >> $TS_OUTPUT
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "C) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
ts_device_deinit $DEVICE
|
||||
ts_fstab_clean
|
||||
|
|
|
@ -44,13 +44,26 @@ ts_udev_dev_support "by-uuid" $UUID
|
|||
|
||||
ts_fstab_add "UUID=$UUID"
|
||||
|
||||
# varian A)
|
||||
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
|
||||
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "Cannot umount $DEVICE" $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
# varian B)
|
||||
$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
# varian C)
|
||||
$TS_CMD_MOUNT UUID=$UUID 2>&1 >> $TS_OUTPUT
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "C) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
ts_device_deinit $DEVICE
|
||||
ts_fstab_clean
|
||||
|
|
|
@ -42,13 +42,19 @@ ts_udev_dev_support "by-label" $LABEL
|
|||
|
||||
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
|
||||
|
||||
# variant A)
|
||||
$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
|
||||
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "Cannot umount $DEVICE" $DEVICE
|
||||
[ "$?" == "0" ] || 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
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
ts_device_deinit $DEVICE
|
||||
|
||||
|
|
|
@ -42,13 +42,19 @@ ts_udev_dev_support "by-uuid" $UUID
|
|||
|
||||
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
|
||||
|
||||
# variant A)
|
||||
$TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
|
||||
|
||||
grep -q $DEVICE /proc/mounts
|
||||
[ "$?" == "0" ] || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
|
||||
[ "$?" == "0" ] || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "Cannot umount $DEVICE" $DEVICE
|
||||
[ "$?" == "0" ] || 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
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
|
||||
$TS_CMD_UMOUNT $DEVICE
|
||||
[ "$?" == "0" ] || ts_die "B) Cannot umount $DEVICE" $DEVICE
|
||||
|
||||
ts_device_deinit $DEVICE
|
||||
|
||||
|
|
Loading…
Reference in New Issue