diff options
| author | Ruediger Meier | 2015-03-31 14:19:40 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2015-04-14 13:18:42 +0200 |
| commit | cbae7931c85d232269d45ec6766b293c40cbdb09 (patch) | |
| tree | b87f66967928f66a9ab8787a5b13c526a5d53024 /tests/ts/blkid | |
| parent | tests: introduce ts_cleanup_on_exit() (diff) | |
| download | kernel-qcow2-util-linux-cbae7931c85d232269d45ec6766b293c40cbdb09.tar.gz kernel-qcow2-util-linux-cbae7931c85d232269d45ec6766b293c40cbdb09.tar.xz kernel-qcow2-util-linux-cbae7931c85d232269d45ec6766b293c40cbdb09.zip | |
tests: introduce TS_LOOP_DEVS for cleanup
We are maintaining an array TS_LOOP_DEVS to de-initialize devices
always on exit. Until now there was no cleanup in ts_skip().
The downside is that we can't execute ts_device_init() in a subshell
anymore. The device is returned via global variable TS_LODEV, similar
like we do already in ts_scsi_debug_init().
Tests which don't use ts_device_init() to create loop devices may use
ts_register_loop_device() to get them cleaned up later.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/blkid')
| -rwxr-xr-x | tests/ts/blkid/md-raid0-whole | 10 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-whole | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index e2359619b..e8b92320e 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -34,11 +34,11 @@ set -o pipefail ts_log "Initialize devices" IMGNAME="${TS_OUTDIR}/${TS_TESTNAME}" -DEVICE1=$(ts_device_init 50 ${IMGNAME}1.img) -[ "$?" == 0 ] || ts_die "Cannot init device1" +ts_device_init 50 ${IMGNAME}1.img +DEVICE1=$TS_LODEV -DEVICE2=$(ts_device_init 50 ${IMGNAME}2.img) -[ "$?" == 0 ] || ts_die "Cannot init device2" $DEVICE1 +ts_device_init 50 ${IMGNAME}2.img +DEVICE2=$TS_LODEV MD_DEVNAME=md8 MD_DEVICE=/dev/${MD_DEVNAME} @@ -80,8 +80,6 @@ mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 udevadm settle ts_log "Deinitialize devices" -ts_device_deinit $DEVICE1 -ts_device_deinit $DEVICE2 ts_fdisk_clean $MD_DEVICE diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index 611ead3b7..bd5f628a9 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -34,11 +34,11 @@ set -o pipefail ts_log "Initialize devices" IMGNAME="${TS_OUTDIR}/${TS_TESTNAME}" -DEVICE1=$(ts_device_init 50 ${IMGNAME}1.img) -[ "$?" == 0 ] || ts_die "Cannot init device1" +ts_device_init 50 ${IMGNAME}1.img +DEVICE1=$TS_LODEV -DEVICE2=$(ts_device_init 50 ${IMGNAME}2.img) -[ "$?" == 0 ] || ts_die "Cannot init device2" $DEVICE1 +ts_device_init 50 ${IMGNAME}2.img +DEVICE2=$TS_LODEV MD_DEVNAME=md8 MD_DEVICE=/dev/${MD_DEVNAME} @@ -80,8 +80,6 @@ mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 udevadm settle ts_log "Deinitialize devices" -ts_device_deinit $DEVICE1 -ts_device_deinit $DEVICE2 ts_fdisk_clean # remove generated UUIDs |