tests: update fdisk tests

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/fdisk/bsd b/tests/expected/fdisk/bsd
index eebff09a28cb2139a05ed0bc874ac22128305dae..554d7265110e37de8e3388dbf1610dc52dc2ea4d 100644 (file)
--- a/tests/expected/fdisk/bsd
+++ b/tests/expected/fdisk/bsd
@@ -68,6 +68,7 @@ partitions: 4
 Slice Start   End Sectors  Size Type     Fsize Bsize Cpg
 c      4096 20479   16384    8M unused       0     0   0
 d         0 16064   16065  7.9M unused       0     0   0
+
 Partition table entries are not in disk order.
 
 Command (m for help): Leaving nested disklabel.
@@ -98,6 +99,7 @@ Slice Start   End Sectors  Size Type     Fsize Bsize Cpg
 a      4096  6144    2049    1M 4.2BSD       0     0   0
 c      4096 20479   16384    8M unused       0     0   0
 d         0 16064   16065  7.9M unused       0     0   0
+
 Partition table entries are not in disk order.
 
 Command (m for help): Leaving nested disklabel.

diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode
index 3ae0cf3c16ccd5e59ee818471d8d6ecf0eec1a8e..6b4d0e40186b3ff3805e70125a4f91e5b406f149 100644 (file)
--- a/tests/expected/fdisk/mbr-dos-mode
+++ b/tests/expected/fdisk/mbr-dos-mode
@@ -150,6 +150,7 @@ Device     Boot Start End Cylinders  Size Id Type
 <removed>2          2  12        12 86.3M  5 Extended
 <removed>5          6   7         2 15.7M 83 Linux
 <removed>6          2   3         2 15.7M 83 Linux
+
 Partition table entries are not in disk order.
 -------------------
 
@@ -169,6 +170,7 @@ Device     Boot Start End Cylinders  Size Id Type
 <removed>2          2  12        12 86.3M  5 Extended
 <removed>5          6   7         2 15.7M 83 Linux
 <removed>6          2   3         2 15.7M 83 Linux
+
 Partition table entries are not in disk order.
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode
index cf7081f7f9dd0556ae9b89c443dd32a0283ff330..c2a55c6dea14fafbe9232700f04ec0a4ef6407e5 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode
+++ b/tests/expected/fdisk/mbr-nondos-mode
@@ -146,6 +146,7 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>3      12288 40959   28672  14M  5 Extended
 <removed>5      26624 30719    4096   2M 83 Linux
 <removed>6      14336 18431    4096   2M 83 Linux
+
 Partition table entries are not in disk order.
 -------------------
 
@@ -165,6 +166,7 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>3      12288 40959   28672  14M  5 Extended
 <removed>5      26624 30719    4096   2M 83 Linux
 <removed>6      14336 18431    4096   2M 83 Linux
+
 Partition table entries are not in disk order.
 -------------------
 
@@ -183,6 +185,7 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>3      12288 40959   28672  14M  5 Extended
 <removed>5      26624 30719    4096   2M 83 Linux
 <removed>6      14336 18431    4096   2M 83 Linux
+
 Partition table entries are not in disk order.
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-sort b/tests/expected/fdisk/mbr-sort
index 0e316c4d58bc475105f944aee80dd4d108ab1c42..a1764bc388121b605b37abe2300dad1f75ccac59 100644 (file)
--- a/tests/expected/fdisk/mbr-sort
+++ b/tests/expected/fdisk/mbr-sort
@@ -23,6 +23,7 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>2       2048  4095    2048   1M 83 Linux
 <removed>3       6144  8191    2048   1M 83 Linux
 <removed>4       8192 40959   32768  16M  5 Extended
+
 Partition table entries are not in disk order.
 -------------------
 
@@ -45,6 +46,7 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>6      22528 24575    2048   1M 83 Linux
 <removed>7      18432 20479    2048   1M 83 Linux
 <removed>8      10240 12287    2048   1M 83 Linux
+
 Partition table entries are not in disk order.
 -------------------
 

diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size
index c7a52085198fd5c3ba54120c2b8a5d3c9d77f90f..f951e4a9c8f61282333344eadbf915e42936c4b2 100644 (file)
--- a/tests/expected/sfdisk/dos-explicit-size
+++ b/tests/expected/sfdisk/dos-explicit-size
@@ -1,3 +1,10 @@
+Partition 1 does not start on physical sector boundary.
+Partition 2 does not start on physical sector boundary.
+Partition 3 does not start on physical sector boundary.
+Partition 4 does not start on physical sector boundary.
+Partition 5 does not start on physical sector boundary.
+Partition 6 does not start on physical sector boundary.
+Partition 7 does not start on physical sector boundary.
 Checking that no-one is using this disk right now ... OK
 
 Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
@@ -26,6 +33,7 @@ Device     Boot Start    End Sectors  Size Id Type
 <removed>6        4003   5002    1000  500K 83 Linux
 <removed>7        5004 102399   97396 47.6M 83 Linux
 
+
 The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.

diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump
index b638e9dcc7443d5266a503107e925da49dcde2cb..6296c226ddbf2f53cce3e781e1fccc87bb742da1 100644 (file)
--- a/tests/expected/sfdisk/dos-read-dump
+++ b/tests/expected/sfdisk/dos-read-dump
@@ -1,3 +1,5 @@
+Partition 5 does not start on physical sector boundary.
+Partition 6 does not start on physical sector boundary.
 Checking that no-one is using this disk right now ... OK
 
 Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
@@ -25,6 +27,7 @@ Device     Boot Start    End Sectors Size Id Type
 <removed>5       20481  26624    6144   3M 83 Linux
 <removed>6       26626 102399   75774  37M 83 Linux
 
+
 The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.

diff --git a/tests/expected/sfdisk/gpt-list-pmbr b/tests/expected/sfdisk/gpt-list-pmbr
index c2a56c781e877947e7beb4f6aecaeafdb70836bf..4df1bc0c4712649eb62d7cecfebdf3d35d2c3cb8 100644 (file)
--- a/tests/expected/sfdisk/gpt-list-pmbr
+++ b/tests/expected/sfdisk/gpt-list-pmbr
@@ -1,3 +1,4 @@
+Partition 1 does not start on physical sector boundary.
 Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
@@ -7,3 +8,4 @@ Disk identifier: <removed>
 
 Device     Boot Start    End Sectors Size Id Type
 <removed>1           1 102399  102399  50M ee GPT
+