diff options
| author | Karel Zak | 2015-04-22 10:03:12 +0200 |
|---|---|---|
| committer | Karel Zak | 2015-04-22 10:03:12 +0200 |
| commit | 6f13d7a1b27da596b57dbec57e3f350296bcbc78 (patch) | |
| tree | 019efc06bb1e91618347d4c3c25081d3c688c67a /tests/ts/libmount | |
| parent | Merge branch 'test-fix' of https://github.com/rudimeier/util-linux (diff) | |
| parent | tests: never use -o pipefail (diff) | |
| download | kernel-qcow2-util-linux-6f13d7a1b27da596b57dbec57e3f350296bcbc78.tar.gz kernel-qcow2-util-linux-6f13d7a1b27da596b57dbec57e3f350296bcbc78.tar.xz kernel-qcow2-util-linux-6f13d7a1b27da596b57dbec57e3f350296bcbc78.zip | |
Merge branch 'tests-refactor-loop-cleanup' of https://github.com/rudimeier/util-linux
* 'tests-refactor-loop-cleanup' of https://github.com/rudimeier/util-linux:
tests: never use -o pipefail
tests: loop tests, don't call ts_die() with DEVICE parameter
tests: scsi_debug tests, don't call ts_die() with DEVICE parameter
tests: introduce TS_LOOP_DEVS for cleanup
tests: introduce ts_cleanup_on_exit()
Diffstat (limited to 'tests/ts/libmount')
| -rwxr-xr-x | tests/ts/libmount/context | 2 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-py | 2 | ||||
| -rwxr-xr-x | tests/ts/libmount/tabfiles-tags | 4 | ||||
| -rwxr-xr-x | tests/ts/libmount/tabfiles-tags-py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 15693d1c6..9424fef90 100755 --- 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 f2190ce8a..0f8398f6e 100755 --- 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 15696b076..662d38b6c 100755 --- 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 d6ca470fb..47efa70e1 100755 --- 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" |