tests: update fdisk test (default output format changed)

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index a510c734e7eacac55c9d976142bb7b9088e01bce..293f4ae00a0453feead3f3bcb1bed2777889c28d 100644 (file)
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -54,8 +54,7 @@ Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using defa
 Partition 7 of type Linux and of size 6 MiB is set
 
 Command (m for help): 
-Disk /dev/...: 52 MB, 52428800 bytes
-32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
+Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / 32768 bytes

diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index e8192ce016e5d03cdd673b2a57d90795836acfab..5369ec55f4b8b36d6e05789eeaf2d7a52f919fa3 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -54,8 +54,7 @@ Last sector, +sectors or +size{K,M,G} (88063-102399, default 102399): Using defa
 Partition 7 of type Linux and of size 7 MiB is set
 
 Command (m for help): 
-Disk /dev/...: 52 MB, 52428800 bytes
-32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
+Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / 32768 bytes

diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index b0081c6aec561fc35d8724d1d36368c60b1efb68..7b7e4bf3632f7f9c9f8f723d1234ddf1496778f4 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -25,8 +25,7 @@ Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using defa
 Partition 2 of type Linux and of size 29 MiB is set
 
 Command (m for help): 
-Disk /dev/...: 52 MB, 52428800 bytes
-32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
+Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / 32768 bytes
@@ -69,8 +68,7 @@ Select (default p): Partition number (1-4, default 2): First sector (22528-10009
 Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): Partition 2 of type Linux and of size 10 MiB is set
 
 Command (m for help): 
-Disk /dev/md8: 51 MB, 51249152 bytes
-2 heads, 4 sectors/track, 12512 cylinders, total 100096 sectors
+Disk /dev/md8: 51 MB, 51249152 bytes, 100096 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 65536 bytes / 131072 bytes

diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 190ad0afe931df7c925a1bf5f4dfb877779d1377..37cfa71ece4ee34bf5e772cf45690774de2017e2 100644 (file)
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -50,8 +50,7 @@ Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using defa
 Partition 7 of type Linux and of size 6 MiB is set
 
 Command (m for help): 
-Disk /dev/loop0: 52 MB, 52428800 bytes
-255 heads, 63 sectors/track, 6 cylinders, total 102400 sectors
+Disk /dev/loop0: 52 MB, 52428800 bytes, 102400 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / 512 bytes

diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 2180081c2d2f11959f73704314ff9d38aa8fcb41..d16233fc38a199d5e980e3c61af78ab7d01dddf0 100644 (file)
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -50,8 +50,7 @@ Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using defa
 Partition 7 of type Linux and of size 6 MiB is set
 
 Command (m for help): 
-Disk /dev/...: 52 MB, 52428800 bytes
-32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
+Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / 32768 bytes

diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput
index 65feb03320ac708fce7c4a393a3d9cc087decd21..14f2528c8d65769110741f2e47d3aa57f2dad665 100644 (file)
--- a/tests/expected/fdisk/oddinput
+++ b/tests/expected/fdisk/oddinput
@@ -2,7 +2,7 @@ Initialize empty image
 f1c9645dbc14efddc7d8a322685f26eb oddinput.img
 Empty image listing
 
-Disk testimage: 10 MB, 10485760 bytes
+Disk testimage: 10 MB, 10485760 bytes, 20480 sectors
 255 heads, 63 sectors/track, 1 cylinders
 Units = cylinders of 16065 * 512 = 8225280 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes