tests: use sfdisk --no-reread wherever it's needed

The first BLKRRPART ioctl causes udev events and then second one may
fail, see Discussion
http://comments.gmane.org/gmane.linux.utilities.util-linux-ng/11885

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

4 files changed, 13 insertions, 12 deletions

diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos
index dbcccf9cb..592d6e411 100755
--- a/tests/ts/sfdisk/dos
+++ b/tests/ts/sfdisk/dos
@@ -126,7 +126,7 @@ label: dos
 ,10M,S,*
 EOF
 udevadm settle
-echo ',+' | $TS_CMD_SFDISK -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
diff --git a/tests/ts/sfdisk/gpt b/tests/ts/sfdisk/gpt
index 2c3d5ccc6..4f802de58 100755
--- a/tests/ts/sfdisk/gpt
+++ b/tests/ts/sfdisk/gpt
@@ -129,7 +129,7 @@ label: gpt
 ,10M,S,*
 EOF
 udevadm settle
-echo ',+' | $TS_CMD_SFDISK -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -149,6 +149,7 @@ ${TS_DEVICE}3 : start=20480, size=81887
 ${TS_DEVICE}4 : start=14336, size=6144
 EOF
 udevadm settle
+# why --reorder does not re-read?
 $TS_CMD_SFDISK --reorder ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 $TS_CMD_SFDISK --list ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata
index b4b953755..d37f72a4f 100755
--- a/tests/ts/sfdisk/movedata
+++ b/tests/ts/sfdisk/movedata
@@ -30,7 +30,7 @@ ts_check_prog "mkfs.ext4"
 ts_scsi_debug_init dev_size_mb=100 sector_size=512
 
 # create a partition
-echo ',10M,L' | $TS_CMD_SFDISK ${TS_DEVICE} &> /dev/null
+echo ',10M,L' | $TS_CMD_SFDISK --no-reread ${TS_DEVICE} &> /dev/null
 udevadm settle
 
 mkfs.ext4 ${TS_DEVICE}1 &> /dev/null
@@ -46,7 +46,7 @@ function checksum() {
 }
 
 ts_init_subtest "up"
-echo '+1000,' | $TS_CMD_SFDISK --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+echo '+1000,' | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 checksum ${TS_DEVICE}1
@@ -55,7 +55,7 @@ ts_finalize_subtest
 udevadm settle
 
 ts_init_subtest "down"
-echo "-500," | $TS_CMD_SFDISK --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+echo "-500," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 checksum ${TS_DEVICE}1
@@ -64,7 +64,7 @@ ts_finalize_subtest
 udevadm settle
 
 ts_init_subtest "non-overlay"
-echo "+30M," | $TS_CMD_SFDISK --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+echo "+30M," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 checksum ${TS_DEVICE}1
diff --git a/tests/ts/sfdisk/resize b/tests/ts/sfdisk/resize
index c5f80f980..8bc3484da 100755
--- a/tests/ts/sfdisk/resize
+++ b/tests/ts/sfdisk/resize
@@ -75,7 +75,7 @@ function test_label_resize {
 	udevadm settle
 
 	# create a partition
-	echo ',10M,L' | $TS_CMD_SFDISK --label ${label} ${TS_DEVICE} &> /dev/null
+	echo ',10M,L' | $TS_CMD_SFDISK --no-reread --label ${label} ${TS_DEVICE} &> /dev/null
 	udevadm settle
 
 	for idx in $(seq 0 $(( ${#COMM[*]} - 1 ))); do
@@ -85,23 +85,23 @@ function test_label_resize {
 
 		ts_init_subtest "$label-$idx-$name"
 		echo -e "$cmd\n" >> $TS_OUTPUT
-		echo "$cmd" | $TS_CMD_SFDISK -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+		echo "$cmd" | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 		ts_fdisk_clean $TS_DEVICE
 		udevadm settle
 		ts_finalize_subtest
 	done
 
-	echo ',10M,L' | $TS_CMD_SFDISK --append ${TS_DEVICE} &> /dev/null
+	echo ',10M,L' | $TS_CMD_SFDISK --no-reread --append ${TS_DEVICE} &> /dev/null
 	udevadm settle
 
-	echo ',10M,L' | $TS_CMD_SFDISK --append ${TS_DEVICE} &> /dev/null
+	echo ',10M,L' | $TS_CMD_SFDISK --no-reread --append ${TS_DEVICE} &> /dev/null
 	udevadm settle
 
 	idx=$(( $idx + 1 ))
 	ts_init_subtest "$label-$idx-reduce-midle"
 	cmd=',-5M'
 	echo -e "$cmd\n" >> $TS_OUTPUT
-	echo "$cmd" | $TS_CMD_SFDISK -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+	echo "$cmd" | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 	ts_fdisk_clean $TS_DEVICE
 	udevadm settle
 	ts_finalize_subtest
@@ -110,7 +110,7 @@ function test_label_resize {
 	ts_init_subtest "$label-$idx-max-last"
 	cmd='-5M,+'
 	echo -e "$cmd\n" >> $TS_OUTPUT
-	echo $cmd | $TS_CMD_SFDISK -N3 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+	echo $cmd | $TS_CMD_SFDISK --no-reread -N3 ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 	ts_fdisk_clean $TS_DEVICE
 	udevadm settle
 	ts_finalize_subtest