From d0bcd9b32284dbfeec9d76f4adf046fd68528398 Mon Sep 17 00:00:00 2001 From: Francesco Cosoleto Date: Wed, 17 Aug 2011 00:19:05 +0200 Subject: [PATCH] tests: add ts_fdisk_clean function to make fdisk output comparable Signed-off-by: Francesco Cosoleto --- tests/functions.sh | 7 +++++++ tests/ts/blkid/md-raid0-whole | 5 ++--- tests/ts/blkid/md-raid1-part | 6 ++---- tests/ts/blkid/md-raid1-whole | 5 ++--- tests/ts/fdisk/align-512-4K | 5 +---- tests/ts/fdisk/align-512-4K-63 | 5 +---- tests/ts/fdisk/align-512-4K-md | 5 +---- tests/ts/fdisk/align-512-512 | 4 +--- tests/ts/fdisk/align-512-512-topology | 5 +---- 9 files changed, 18 insertions(+), 29 deletions(-) diff --git a/tests/functions.sh b/tests/functions.sh index 70bd45a235..acfbbeefe3 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -393,3 +393,10 @@ s/# //; /^$/d" /etc/fstab } +function ts_fdisk_clean { + # remove non comparable parts of fdisk output + [ x"${DEVNAME}" != x"" ] && sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT + sed -i -e 's/Disk identifier:.*//g' \ + -e 's/Building a new.*//g' \ + $TS_OUTPUT +} diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index 2ef7bcdf64..7a55c549b9 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -78,9 +78,8 @@ ts_log "Deinitialize devices" ts_device_deinit $DEVICE1 ts_device_deinit $DEVICE2 -# remove disk ID and generated UUIDs -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean +# remove generated UUIDs sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT ts_finalize diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index 75630a2d37..634c9a1541 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -82,10 +82,8 @@ $TS_CMD_BLKID -p -o udev ${DEVICE}2 2>&1 | sort >> $TS_OUTPUT sleep 3 rmmod scsi_debug -# remove device name used, disk ID and generated UUIDs -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean +# remove generated UUIDs sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT ts_finalize diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index 75efc42719..32e17b8d02 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -78,9 +78,8 @@ ts_log "Deinitialize devices" ts_device_deinit $DEVICE1 ts_device_deinit $DEVICE2 -# remove disk ID and generated UUIDs -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean +# remove generated UUIDs sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT ts_finalize diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K index 2bc128042e..3d930223b4 100755 --- a/tests/ts/fdisk/align-512-4K +++ b/tests/ts/fdisk/align-512-4K @@ -82,9 +82,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP sleep 3 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63 index cd7d2ac5af..7a8e95cef3 100755 --- a/tests/ts/fdisk/align-512-4K-63 +++ b/tests/ts/fdisk/align-512-4K-63 @@ -82,9 +82,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP sleep 3 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index fc2ce69cfe..f55ee22f12 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -94,9 +94,6 @@ sleep 3 /sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512 index f60f404f2c..82a6268cf4 100755 --- a/tests/ts/fdisk/align-512-512 +++ b/tests/ts/fdisk/align-512-512 @@ -65,8 +65,6 @@ EOF ts_device_deinit $DEVICE -# remove disk ID -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology index baf9155a74..ec10fd85f0 100755 --- a/tests/ts/fdisk/align-512-512-topology +++ b/tests/ts/fdisk/align-512-512-topology @@ -82,9 +82,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP sleep 3 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize -- 2.47.2