tests: add ts_fdisk_clean function to make fdisk output comparable

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>

diff --git a/tests/functions.sh b/tests/functions.sh
index 70bd45a2357a51f877fc43dfea4e4a4506aea784..acfbbeefe3cbcb606d2ef2c6e6ea958e902f8db2 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -393,3 +393,10 @@ s/# <!-- util-linux.*-->//;
 /^$/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 2ef7bcdf64c6036cb6e9522a33b51ce9f9ddfc25..7a55c549b9beeee3042e542a6876db9519bbf076 100755 (executable)
--- 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 75630a2d37cdc2bd5920d6b57dc987546842aecd..634c9a15418ae90de18bc1e9c6a2eb7e1bcbdd24 100755 (executable)
--- 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 75efc42719bd54a9414eeaac329f3d189dc1f43f..32e17b8d020369bee097e49624b48cbaa48af6cc 100755 (executable)
--- 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 2bc128042e04a7a0d89d545bb7502aaa48d96c4a..3d930223b434c3a3f44b4e7130bcbbfafe1c3202 100755 (executable)
--- 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 cd7d2ac5af81a3b2680001f1c56a32ed2431aeb4..7a8e95cef315ee9f2386db689357a41e8660c1e6 100755 (executable)
--- 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 fc2ce69cfe56443270f212a4b348f0a42881cb92..f55ee22f12e23762b27426d824fc71ff9cf2757e 100755 (executable)
--- 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 f60f404f2cb95b29f5cee58eab8ad0d3f0436383..82a6268cf43278dbce00d19113c53e76bf93593b 100755 (executable)
--- 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 baf9155a74fca862c802a5459c45d0ac59f1335d..ec10fd85f0e613efdbbde0dc05ee08cd2afe71a0 100755 (executable)
--- 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