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>

5 files changed, 16 insertions, 10 deletions

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 293f4ae00..e5a28f54a 100644
--- 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 5369ec55f..7e236ce55 100644
--- 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 7b7e4bf36..dbbbc05e3 100644
--- 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 37cfa71ec..018322f1d 100644
--- 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 d16233fc3..b3d31146c 100644
--- 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