diff options
| author | Karel Zak | 2013-04-12 13:49:08 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-04-12 14:02:39 +0200 |
| commit | 188d9656c3819a12059cfe826b4c78b9383c6a68 (patch) | |
| tree | 015497143f5062339ba4d09bf498087fe560e93f /tests/ts/fdisk | |
| parent | libmount: fix mount.nfs segfault, rely on assert() rather than on nonnull (diff) | |
| download | kernel-qcow2-util-linux-188d9656c3819a12059cfe826b4c78b9383c6a68.tar.gz kernel-qcow2-util-linux-188d9656c3819a12059cfe826b4c78b9383c6a68.tar.xz kernel-qcow2-util-linux-188d9656c3819a12059cfe826b4c78b9383c6a68.zip | |
tests: use udevadm settle rather than sleep
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/fdisk')
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K | 2 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-63 | 2 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-md | 7 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-512-topology | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K index 3d930223b..d72c96c1a 100755 --- a/tests/ts/fdisk/align-512-4K +++ b/tests/ts/fdisk/align-512-4K @@ -76,10 +76,10 @@ w q EOF +udevadm settle ts_log "Alignment offsets:" cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>&1 -sleep 3 rmmod scsi_debug ts_fdisk_clean diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63 index 7a8e95cef..e1b03fda4 100755 --- a/tests/ts/fdisk/align-512-4K-63 +++ b/tests/ts/fdisk/align-512-4K-63 @@ -76,10 +76,10 @@ w q EOF +udevadm settle ts_log "Alignment offsets:" cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>&1 -sleep 3 rmmod scsi_debug ts_fdisk_clean diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index f55ee22f1..bd7bb0f0c 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -59,10 +59,10 @@ w q EOF +udevadm settle ts_log "Alignment offsets:" cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>&1 -sleep 3 MD_DEVNAME=md8 MD_DEVICE=/dev/${MD_DEVNAME} @@ -70,6 +70,7 @@ MD_DEVICE=/dev/${MD_DEVNAME} /sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \ --level=0 --raid-devices=2 ${DEVICE}1 ${DEVICE}2 >> $TS_OUTPUT 2>&1 +udevadm settle ts_log "Create partitions (MD)" $TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF n @@ -87,11 +88,13 @@ w q EOF +udevadm settle ts_log "Alignment offsets (MD):" cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT 2>&1 -sleep 3 /sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 + +udevadm settle rmmod scsi_debug ts_fdisk_clean diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology index ec10fd85f..2a83e0839 100755 --- a/tests/ts/fdisk/align-512-512-topology +++ b/tests/ts/fdisk/align-512-512-topology @@ -76,10 +76,10 @@ w q EOF +udevadm settle ts_log "Alignment offsets:" cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>&1 -sleep 3 rmmod scsi_debug ts_fdisk_clean |