tests: update fdisk tests

 - the new fdisk ask-partition-number dialog does not ask for non-senses
   (non-existing partitions etc.)

 - 'p'rint command prints disk label name (usually "dos" in the tests)

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

diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole
index d9c44665e7539da64e61889b7b9ad6d8e9b757f3..37dabf3fb7a3eabc6df9f6cc24c39897bfab4313 100644 (file)
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -18,7 +18,7 @@ Last sector, +sectors or +size{K,M,G} (2048-204543, default 204543): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (22528-204543, default 22528): Using default value 22528
+Select (default p): Partition number (2-4, default 2): First sector (22528-204543, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-204543, default 204543): Using default value 204543
 Partition 2 of type Linux and of size 88.9 MiB is set
 
@@ -27,6 +27,7 @@ Disk /dev/md8: 104 MB, 104726528 bytes, 204544 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 65536 bytes / 131072 bytes
+Disk label type: dos
 
 
     Device Boot      Start         End      Blocks   Id  System

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index ce93b73409ddbdee39a1b9fed131602928a92cad..f409952203eb1dbc9a9424d81c4fac7cbd28f79c 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -16,7 +16,7 @@ Last sector, +sectors or +size{K,M,G} (2048-104447, default 104447): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (53248-104447, default 53248): Using default value 53248
+Select (default p): Partition number (2-4, default 2): First sector (53248-104447, default 53248): Using default value 53248
 Last sector, +sectors or +size{K,M,G} (53248-104447, default 104447): Using default value 104447
 Partition 2 of type Linux and of size 25 MiB is set
 
@@ -25,6 +25,7 @@ Disk /dev/...: 53 MB, 53477376 bytes, 104448 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
+Disk label type: dos
 
 
    Device Boot      Start         End      Blocks   Id  System

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index b6e45dc0faea54b376c8ca64906e84550ed85134..89773120eb864efda8d710449a973b579d07961d 100644 (file)
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -18,7 +18,7 @@ Last sector, +sectors or +size{K,M,G} (2048-102271, default 102271): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (22528-102271, default 22528): Using default value 22528
+Select (default p): Partition number (2-4, default 2): First sector (22528-102271, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102271, default 102271): Partition 2 of type Linux and of size 10 MiB is set
 
 Command (m for help): 
@@ -26,6 +26,7 @@ Disk /dev/md8: 52 MB, 52363264 bytes, 102272 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
+Disk label type: dos
 
 
     Device Boot      Start         End      Blocks   Id  System

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 293f4ae00a0453feead3f3bcb1bed2777889c28d..e5a28f54a0bb3d1527412145a207db9616129a5e 100644 (file)
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -20,13 +20,13 @@ Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
+Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
    p   primary (2 primary, 0 extended, 2 free)
    e   extended
-Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
@@ -58,6 +58,7 @@ 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
+Disk label type: dos
 
 
    Device Boot      Start         End      Blocks   Id  System

diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 5369ec55f4b8b36d6e05789eeaf2d7a52f919fa3..7e236ce55b56d3bd73b95805fd6e939a61555d7a 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -20,13 +20,13 @@ Last sector, +sectors or +size{K,M,G} (7-102399, default 102399): Partition 1 of
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487
+Select (default p): Partition number (2-4, default 2): First sector (20487-102399, default 20487): Using default value 20487
 Last sector, +sectors or +size{K,M,G} (20487-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
    p   primary (2 primary, 0 extended, 2 free)
    e   extended
-Select (default p): Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967
+Select (default p): Partition number (3,4, default 3): First sector (40967-102399, default 40967): Using default value 40967
 Last sector, +sectors or +size{K,M,G} (40967-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
@@ -59,6 +59,7 @@ Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / 32768 bytes
 Alignment offset: 3584 bytes
+Disk label type: dos
 
 
    Device Boot      Start         End      Blocks   Id  System

diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 7b7e4bf3632f7f9c9f8f723d1234ddf1496778f4..dbbbc05e33c3184eb8f936ff2f512eb7ed73cd13 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -20,7 +20,7 @@ Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (2-4, default 2): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using default value 102399
 Partition 2 of type Linux and of size 29 MiB is set
 
@@ -29,6 +29,7 @@ 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
+Disk label type: dos
 
 
    Device Boot      Start         End      Blocks   Id  System
@@ -64,7 +65,7 @@ Last sector, +sectors or +size{K,M,G} (2048-100095, default 100095): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528
+Select (default p): Partition number (2-4, default 2): First sector (22528-100095, default 22528): Using default value 22528
 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): 
@@ -72,6 +73,7 @@ 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
+Disk label type: dos
 
 
     Device Boot      Start         End      Blocks   Id  System

diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 37cfa71ece4ee34bf5e772cf45690774de2017e2..018322f1d9dce31635f842b8de4a08a883dd4929 100644 (file)
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -16,13 +16,13 @@ Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
+Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
    p   primary (2 primary, 0 extended, 2 free)
    e   extended
-Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
@@ -54,6 +54,7 @@ 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
+Disk label type: dos
 
 
       Device Boot      Start         End      Blocks   Id  System

diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index d16233fc38a199d5e980e3c61af78ab7d01dddf0..b3d31146c1f70a4bfe0d469cf4717fcbbc85edcb 100644 (file)
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -16,13 +16,13 @@ Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): Partition 1
 Command (m for help): Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
+Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): Partition 2 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
    p   primary (2 primary, 0 extended, 2 free)
    e   extended
-Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Partition 3 of type Linux and of size 10 MiB is set
 
 Command (m for help): Partition type:
@@ -54,6 +54,7 @@ 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
+Disk label type: dos
 
 
    Device Boot      Start         End      Blocks   Id  System