tests: update fdisk outputs

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 37dabf3fb7a3eabc6df9f6cc24c39897bfab4313..e4978cbee38f3dbd921e714cbc5275ebac6004ae 100644 (file)
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -2,42 +2,44 @@ Initialize devices
 Create RAID device
 Create partitions on RAID device
 
-
+Welcome to fdisk <removed>.
 Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
-Device does not contain a recognized partition table
+Device does not contain a recognized partition table.
 
+Created a new <removed>.
 
-Command (m for help): Partition type:
+Command (m for help): 
+Partition type:
    p   primary (0 primary, 0 extended, 4 free)
    e   extended
-Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-204543, default 204543): Partition 1 of type Linux and of size 10 MiB is set
+Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-204543, default 204543): 
+Created a new <removed>.
 
-Command (m for help): Partition type:
+Command (m for help): 
+Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-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
+Select (default p): Partition number (2-4, default 2): First sector (22528-204543, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-204543, default 204543): 
+Created a new <removed>.
 
-Command (m for help): 
-Disk /dev/md8: 104 MB, 104726528 bytes, 204544 sectors
-Units = sectors of 1 * 512 = 512 bytes
+Command (m for help): Disk <removed>: 99.9 MiB, 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
+Disk identifier: <removed>
 
+Device     Boot     Start       End Blocks  Id System
+<removed>p1           2048     22527  10240  83 Linux
+<removed>p2          22528    204543  91008  83 Linux
 
-    Device Boot      Start         End      Blocks   Id  System
-/dev/md8p1            2048       22527       10240   83  Linux
-/dev/md8p2           22528      204543       91008   83  Linux
-
-Command (m for help): The partition table has been altered!
-
+Command (m for help): 
+The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
+
 Probe first RAID member
 ID_FS_TYPE=linux_raid_member
 ID_FS_USAGE=raid

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index 2f34ecf4bb66d51e6a0063e619e1079a66a38722..133fdcec92c6eae2fbaeb05211cd3845912da5a3 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -1,41 +1,43 @@
 Create partitions
 
-
+Welcome to fdisk <removed>.
 Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
-Device does not contain a recognized partition table
+Device does not contain a recognized partition table.
 
+Created a new <removed>.
 
-Command (m for help): Partition type:
+Command (m for help): 
+Partition type:
    p   primary (0 primary, 0 extended, 4 free)
    e   extended
-Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-104447, default 104447): Partition 1 of type Linux and of size 25 MiB is set
+Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-104447, default 104447): 
+Created a new <removed>.
 
-Command (m for help): Partition type:
+Command (m for help): 
+Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-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
+Select (default p): Partition number (2-4, default 2): First sector (53248-104447, default 53248): Last sector, +sectors or +size{K,M,G,T,P} (53248-104447, default 104447): 
+Created a new <removed>.
 
-Command (m for help): 
-Disk /dev/...: 53 MB, 53477376 bytes, 104448 sectors
-Units = sectors of 1 * 512 = 512 bytes
+Command (m for help): Disk <removed>: 51 MiB, 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
+Disk identifier: <removed>
 
+Device     Boot     Start       End Blocks  Id System
+<removed>1           2048     53247  25600  83 Linux
+<removed>2          53248    104447  25600  83 Linux
 
-   Device Boot      Start         End      Blocks   Id  System
-/dev/...1            2048       53247       25600   83  Linux
-/dev/...2           53248      104447       25600   83  Linux
-
-Command (m for help): The partition table has been altered!
-
+Command (m for help): 
+The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
+
 Create RAID1 device
 Probe whole-disk
 ID_PART_TABLE_TYPE=dos

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 89773120eb864efda8d710449a973b579d07961d..4db226ad5aa32cb9c3e54cde6e3946b4a9ad355d 100644 (file)
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -2,41 +2,44 @@ Initialize devices
 Create RAID device
 Create partitions on RAID device
 
-
+Welcome to fdisk <removed>.
 Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
-Device does not contain a recognized partition table
+Device does not contain a recognized partition table.
 
+Created a new <removed>.
 
-Command (m for help): Partition type:
+Command (m for help): 
+Partition type:
    p   primary (0 primary, 0 extended, 4 free)
    e   extended
-Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Using default value 2048
-Last sector, +sectors or +size{K,M,G} (2048-102271, default 102271): Partition 1 of type Linux and of size 10 MiB is set
+Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102271, default 102271): 
+Created a new <removed>.
 
-Command (m for help): Partition type:
+Command (m for help): 
+Partition type:
    p   primary (1 primary, 0 extended, 3 free)
    e   extended
-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
+Select (default p): Partition number (2-4, default 2): First sector (22528-102271, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102271, default 102271): 
+Created a new <removed>.
 
-Command (m for help): 
-Disk /dev/md8: 52 MB, 52363264 bytes, 102272 sectors
-Units = sectors of 1 * 512 = 512 bytes
+Command (m for help): Disk /dev/md8: 50 MiB, 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
+Disk identifier: <removed>
 
+Device     Boot     Start       End Blocks  Id System
+/dev/md8p1           2048     22527  10240  83 Linux
+/dev/md8p2          22528     43007  10240  83 Linux
 
-    Device Boot      Start         End      Blocks   Id  System
-/dev/md8p1            2048       22527       10240   83  Linux
-/dev/md8p2           22528       43007       10240   83  Linux
-
-Command (m for help): The partition table has been altered!
-
+Command (m for help): 
+The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
+
 Probe first RAID member
 ID_FS_TYPE=linux_raid_member
 ID_FS_USAGE=raid

diff --git a/tests/expected/partx/partx-dos+bsd b/tests/expected/partx/partx-dos+bsd
index 75cdfe85ba8b70c3d7dc8d2350962869852a0568..379633d9db5b7bc3493fb9fca22c342d38b1123c 100644 (file)
--- a/tests/expected/partx/partx-dos+bsd
+++ b/tests/expected/partx/partx-dos+bsd
@@ -1,5 +1,5 @@
 NR START   END SECTORS SIZE NAME UUID
- 1    32  7679    7648 3.8M      
- 2  7680 16383    8704 4.3M      
+ 1    32  7679    7648 3.8M      8f8378c0-01
+ 2  7680 16383    8704 4.3M      8f8378c0-02
  5  7936 12799    4864 2.4M      
  6 12544 16127    3584 1.8M      

diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole
index 45c5bb0ec5d5556be83dd6551afd126de59d39c2..bf95f77f5e10d17fc118b058ea82ee8ee7270713 100755 (executable)
--- a/tests/ts/blkid/md-raid0-whole
+++ b/tests/ts/blkid/md-raid0-whole
@@ -78,7 +78,7 @@ ts_log "Deinitialize devices"
 ts_device_deinit $DEVICE1
 ts_device_deinit $DEVICE2
 
-ts_fdisk_clean
+ts_fdisk_clean $MD_DEVICE
 
 # remove generated UUIDs
 sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT