tests: scsi_debug tests, don't call ts_die() with DEVICE parameter

This was almost useless anyway.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 6de160bead7f8c73c828fae27761a91660312b5e..5037c72eb537e6c63ef7c4436cf509ae7cf3b6b7 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -81,7 +81,7 @@ function is_mounted {
 
 
 udevadm settle
-ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 
 ts_init_subtest "mount-by-devname"

diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 4db2ac12df42a3fba6d4de948c427e2374297faa..21bbbe63ca6cc267a311d9dc42571596ffbc9335 100755 (executable)
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -83,7 +83,7 @@ function is_mounted {
 
 
 udevadm settle
-ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 
 ts_init_subtest "mount-by-devname"

diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index 15696b076518a614b5fab49d3ec5724b6e0a76b2..662d38b6c604dd521b70cc8ba2ae1aafb6f37bdc 100755 (executable)
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -24,10 +24,10 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
 #
 # Create filesystem
 #
-mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE" $TS_DEVICE
+mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE"
 udevadm settle
 
-ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE" $TS_DEVICE
+ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE"
 
 FSTAB="$TS_OUTDIR/fstab"
 

diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py
index d6ca470fb4049ce52a17156d388fc8a02f7108f6..47efa70e1d8fb477de8b53fac4cfefdae74f6cd2 100755 (executable)
--- a/tests/ts/libmount/tabfiles-tags-py
+++ b/tests/ts/libmount/tabfiles-tags-py
@@ -27,10 +27,10 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
 #
 # Create filesystem
 #
-mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE" $TS_DEVICE
+mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE"
 udevadm settle
 
-ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE" $TS_DEVICE
+ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE"
 
 FSTAB="$TS_OUTDIR/fstab"