summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPetr Uzel2012-07-26 16:04:28 +0200
committerKarel Zak2012-07-26 17:19:07 +0200
commit51ffaed7232e83872325ab10ee5642e1e2dcda7c (patch)
tree7a8fae33ac9f01d6270849fde21cf6a8c8f6de44 /tests
parentfdisk: don't print CHS geometry unless DOS compatible mode is set (diff)
downloadkernel-qcow2-util-linux-51ffaed7232e83872325ab10ee5642e1e2dcda7c.tar.gz
kernel-qcow2-util-linux-51ffaed7232e83872325ab10ee5642e1e2dcda7c.tar.xz
kernel-qcow2-util-linux-51ffaed7232e83872325ab10ee5642e1e2dcda7c.zip
tests: update fdisk test (default output format changed)
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/fdisk/align-512-4K3
-rw-r--r--tests/expected/fdisk/align-512-4K-633
-rw-r--r--tests/expected/fdisk/align-512-4K-md6
-rw-r--r--tests/expected/fdisk/align-512-5123
-rw-r--r--tests/expected/fdisk/align-512-512-topology3
-rw-r--r--tests/expected/fdisk/oddinput2
6 files changed, 7 insertions, 13 deletions
diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index a510c734e..293f4ae00 100644
--- 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 e8192ce01..5369ec55f 100644
--- 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 b0081c6ae..7b7e4bf36 100644
--- 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 190ad0afe..37cfa71ec 100644
--- 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 2180081c2..d16233fc3 100644
--- 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 65feb0332..14f2528c8 100644
--- 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