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>

diff --git a/tests/expected/sfdisk/dos-resize b/tests/expected/sfdisk/dos-resize
index 3ce02ec469f538d752f95e5b22425b72cb82adcb..b721816a409f82c8ff74a8a5bfdc135070dcde2d 100644 (file)
--- a/tests/expected/sfdisk/dos-resize
+++ b/tests/expected/sfdisk/dos-resize
@@ -1,5 +1,3 @@
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes

diff --git a/tests/expected/sfdisk/gpt-resize b/tests/expected/sfdisk/gpt-resize
index dbe41ba61d3be61b48653939413cd6e592d177be..f4f17c73b24e3d214eb5f44d5c3ea86446462e7c 100644 (file)
--- a/tests/expected/sfdisk/gpt-resize
+++ b/tests/expected/sfdisk/gpt-resize
@@ -1,5 +1,3 @@
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes

diff --git a/tests/expected/sfdisk/movedata-down b/tests/expected/sfdisk/movedata-down
index 227cf8cbc377d6946a2be8e1a336c2ea0a34eaad..6b5339801aa063561bc37332afc40627a106e95c 100644 (file)
--- a/tests/expected/sfdisk/movedata-down
+++ b/tests/expected/sfdisk/movedata-down
@@ -1,5 +1,3 @@
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/movedata-non-overlay b/tests/expected/sfdisk/movedata-non-overlay
index 6a07831b98283dfbe1f95f544086c95735d7ad18..0a4d525ae76491bc64846977bdc085eecf2156a5 100644 (file)
--- a/tests/expected/sfdisk/movedata-non-overlay
+++ b/tests/expected/sfdisk/movedata-non-overlay
@@ -1,5 +1,3 @@
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/movedata-up b/tests/expected/sfdisk/movedata-up
index e68d33bf22529602690ce2fbe3ec26974e725542..14f2122f37712cf58e24818286e51dd32454f592 100644 (file)
--- a/tests/expected/sfdisk/movedata-up
+++ b/tests/expected/sfdisk/movedata-up
@@ -1,5 +1,3 @@
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-0-move-up-absolute b/tests/expected/sfdisk/resize-dos-0-move-up-absolute
index 14d1a7656b56ca716c070717a23baae76e5d811c..6fb298f76664bfed7859aed43bd9c8cc4f38b836 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-0-move-up-absolute
+++ b/tests/expected/sfdisk/resize-dos-0-move-up-absolute
@@ -1,7 +1,5 @@
 3000,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-1-move-down-absolute b/tests/expected/sfdisk/resize-dos-1-move-down-absolute
index feaa2b2e6c261203383c1603820d9b99f967132c..9db9e6e438e5c9d9de91b2715d0cde36d62c2e85 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-1-move-down-absolute
+++ b/tests/expected/sfdisk/resize-dos-1-move-down-absolute
@@ -1,7 +1,5 @@
 2048,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-10-down-enlarge b/tests/expected/sfdisk/resize-dos-10-down-enlarge
index 83eb2d8e8490e35a8b65c67b463892b19589f6e7..bd8d4c72594d85c4536569c92c4b36057fb3c8b4 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-10-down-enlarge
+++ b/tests/expected/sfdisk/resize-dos-10-down-enlarge
@@ -1,7 +1,5 @@
 -10M,+10M,,*
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize
index eef18a0d27b3356b5bf909867ea3208096be4725..fabcd7059f608b8bfc8d7709f91d4d8ed9ded344 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize
+++ b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize
@@ -1,7 +1,5 @@
 2048,10M,L
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-12-reduce-midle b/tests/expected/sfdisk/resize-dos-12-reduce-midle
index eaea4eb9a5a84d0b2198b585e3b36ffb6d809e36..a992a8078ba876d589e949e1815fc37f298c03fa 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-12-reduce-midle
+++ b/tests/expected/sfdisk/resize-dos-12-reduce-midle
@@ -1,7 +1,5 @@
 ,-5M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-13-max-last b/tests/expected/sfdisk/resize-dos-13-max-last
index af514ac4e531be5360817b84692361cbcebbe016..1680de77c54cf2f157efe142b232be3e8f99489a 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-13-max-last
+++ b/tests/expected/sfdisk/resize-dos-13-max-last
@@ -1,7 +1,5 @@
 -5M,+
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-2-move-up-relative b/tests/expected/sfdisk/resize-dos-2-move-up-relative
index 50cc67de79e549e8bd0d7ccbcf5927cc690604f9..dde3c7fd274404938546b4173575471c81b33bcd 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-2-move-up-relative
+++ b/tests/expected/sfdisk/resize-dos-2-move-up-relative
@@ -1,7 +1,5 @@
 +1M,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-3-move-down-relative b/tests/expected/sfdisk/resize-dos-3-move-down-relative
index ec51a12575c683dcd765dc921ec4621dc243f0be..b4db47840c0a6bd68754900a453b2934d133f852 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-3-move-down-relative
+++ b/tests/expected/sfdisk/resize-dos-3-move-down-relative
@@ -1,7 +1,5 @@
 -1M,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute
index c3ce8b77688e692146c5ad014058a4945a7ad210..6006068507ec07706268f18acf020f31f7719a43 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute
+++ b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute
@@ -1,7 +1,5 @@
 -,15M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-5-reduce-absolute b/tests/expected/sfdisk/resize-dos-5-reduce-absolute
index 0ee2b075cda11d82f029d3cdd77a2fa050823d65..b11f635431af6d001ea42c376421751c5e182f7a 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-5-reduce-absolute
+++ b/tests/expected/sfdisk/resize-dos-5-reduce-absolute
@@ -1,7 +1,5 @@
 ,5M,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-6-enlarge-relative b/tests/expected/sfdisk/resize-dos-6-enlarge-relative
index 312945dec33d61b24aee7bef3d753a99fc39aab3..681bb93cb5f7ccb72afc6f517b47f2d0540a0cd2 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-6-enlarge-relative
+++ b/tests/expected/sfdisk/resize-dos-6-enlarge-relative
@@ -1,7 +1,5 @@
 , +10M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-7-reduce-relative b/tests/expected/sfdisk/resize-dos-7-reduce-relative
index f01e2a920eb288c9dda801ea38e745e4ada63b0c..c2ab970bc907d562fb709a5301e0690b4ce2a83c 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-7-reduce-relative
+++ b/tests/expected/sfdisk/resize-dos-7-reduce-relative
@@ -1,7 +1,5 @@
 , -10M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-8-enlarge-all b/tests/expected/sfdisk/resize-dos-8-enlarge-all
index 829dfd4973ff571df44bb09a826cd41c4828f07f..f577aff33786fdbb8c6748f4e8beb401c2c51939 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-8-enlarge-all
+++ b/tests/expected/sfdisk/resize-dos-8-enlarge-all
@@ -1,7 +1,5 @@
 ,+
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-dos-9-up-preduce b/tests/expected/sfdisk/resize-dos-9-up-preduce
index a1119f1475961f4d0759a918995e90972865e918..829c98dba70b173a4229275dcb82a4443c24eb6f 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-9-up-preduce
+++ b/tests/expected/sfdisk/resize-dos-9-up-preduce
@@ -1,7 +1,5 @@
 +10M,-10M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute
index 2f8478759ed949890736a04d556a00fbaa24d519..d337dbd54b717b64e810103cc6d41329c5aac39b 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute
+++ b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute
@@ -1,7 +1,5 @@
 3000,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute
index ad28d6fdd29fcf2196670e353ad270ccebe72c49..16233f73f877da25b239f0a8f8251a725facadf6 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute
+++ b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute
@@ -1,7 +1,5 @@
 2048,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-10-down-enlarge b/tests/expected/sfdisk/resize-gpt-10-down-enlarge
index 44b1fb7b76fd9998a46115a09de290c9714b3e6a..f2ed7fb5b6469486d0e02ea34322f5216f2007eb 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-10-down-enlarge
+++ b/tests/expected/sfdisk/resize-gpt-10-down-enlarge
@@ -1,7 +1,5 @@
 -10M,+10M,,*
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize
index c4dd0cbcede8f904f2401b7a35c49ccb9d88d70e..bfa3d07d2263ca08053d505e6a55382abacf25f2 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize
+++ b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize
@@ -1,7 +1,5 @@
 2048,10M,L
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-12-reduce-midle b/tests/expected/sfdisk/resize-gpt-12-reduce-midle
index fad398e8a9fe87836c7ff871292e05baddc0d9df..aad0a6a28385d16031ea0e4637a5e41941610b60 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-12-reduce-midle
+++ b/tests/expected/sfdisk/resize-gpt-12-reduce-midle
@@ -1,7 +1,5 @@
 ,-5M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-13-max-last b/tests/expected/sfdisk/resize-gpt-13-max-last
index bcbe729b644d550ffca6c5276d454399514e9c1d..b08a6fc939ecae0fbed4e3c6976557cb661a4890 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-13-max-last
+++ b/tests/expected/sfdisk/resize-gpt-13-max-last
@@ -1,7 +1,5 @@
 -5M,+
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-2-move-up-relative b/tests/expected/sfdisk/resize-gpt-2-move-up-relative
index deaf77744794a40558cdb7472ecb68219c92107c..18c685ca0def7fc031a5071b260eafbc79be5b0d 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-2-move-up-relative
+++ b/tests/expected/sfdisk/resize-gpt-2-move-up-relative
@@ -1,7 +1,5 @@
 +1M,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-3-move-down-relative b/tests/expected/sfdisk/resize-gpt-3-move-down-relative
index eb7b80b644cb651a31b9a264282db2208951be39..18252824d8db8e31e7fdcaf108eab264b758b89a 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-3-move-down-relative
+++ b/tests/expected/sfdisk/resize-gpt-3-move-down-relative
@@ -1,7 +1,5 @@
 -1M,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute
index 2a7843e332d8e072e23c297d39000678f010daa6..1cae0cdb8d1e5b1cd90c0a3465230e258f3ab2e4 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute
+++ b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute
@@ -1,7 +1,5 @@
 -,15M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute
index 453f1fe30f8d2f16b44792d954b8e27e514c77a8..3e5d33a2b5abad894c2cf70f0f7da72f5f30603d 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute
+++ b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute
@@ -1,7 +1,5 @@
 ,5M,
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative
index 064f74d123e8c9428fbb320c08424703727e23bf..8cea323f9d39643eb933dd2f0ffb97fa91f83ca5 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative
+++ b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative
@@ -1,7 +1,5 @@
 , +10M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-7-reduce-relative b/tests/expected/sfdisk/resize-gpt-7-reduce-relative
index 8bb65f15c0d5777507dc337c7f4cd4d077e6502d..5b8fd43e46814a629ffb54ffcd72693ed62137ce 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-7-reduce-relative
+++ b/tests/expected/sfdisk/resize-gpt-7-reduce-relative
@@ -1,7 +1,5 @@
 , -10M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-8-enlarge-all b/tests/expected/sfdisk/resize-gpt-8-enlarge-all
index 85a5c701a97b77e339007d5e0a095ae82199ddae..89bbe8395edccfde36dc3eb1cb6a1a5bed971a30 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-8-enlarge-all
+++ b/tests/expected/sfdisk/resize-gpt-8-enlarge-all
@@ -1,7 +1,5 @@
 ,+
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/resize-gpt-9-up-preduce b/tests/expected/sfdisk/resize-gpt-9-up-preduce
index 741f172fbb7abdce00ece11a00258f642ffe4582..bf0faa5710fa1fc688c0ad34c6cb7741896147ca 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-9-up-preduce
+++ b/tests/expected/sfdisk/resize-gpt-9-up-preduce
@@ -1,7 +1,5 @@
 +10M,-10M
 
-Checking that no-one is using this disk right now ... OK
-
 Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos
index dbcccf9cbc98b2f45f4945c83bf1c134922c7677..592d6e41196c1d8ac9aa57964f2b9dd18b7eadfe 100755 (executable)
--- 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 2c3d5ccc6d3f729b1f428fc4861b1309b9286cee..4f802de58d31d33c735ac19f767de1bb6a4a75a5 100755 (executable)
--- 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 b4b9537551d28e3084cd40d535d47555f0353dd2..d37f72a4f4ebddb7dfa7e05cc08995184796404f 100755 (executable)
--- 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 c5f80f980793f0b876e5c5e59c9692ad308be23b..8bc3484da5c02797783147c43edf42527993cb72 100755 (executable)
--- 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