tests: update blkid tests with fdisk output

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

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 002c2c01e031a70c0d96b942cea84ce563916e35..f2560af7a7d002e1b75d326fc642406f2b48db89 100644 (file)
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -28,7 +28,7 @@ TS_HELPER_ISLOCAL="$top_builddir/test_islocal"
 TS_HELPER_LOGINDEFS="$top_builddir/test_logindefs"
 
 # TODO: use partx
-TS_HELPER_PARTITIONS="$top_builddir/samples-partitions"
+TS_HELPER_PARTITIONS="$top_builddir/sample-partitions"
 
 # paths to commands
 TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount"}

diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole
index bc8085fcc4a2b48d852dd4d15c64dc02fab1a70d..d9c44665e7539da64e61889b7b9ad6d8e9b757f3 100644 (file)
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -23,8 +23,7 @@ Last sector, +sectors or +size{K,M,G} (22528-204543, default 204543): Using defa
 Partition 2 of type Linux and of size 88.9 MiB is set
 
 Command (m for help): 
-Disk /dev/md8: 104 MB, 104726528 bytes
-2 heads, 4 sectors/track, 25568 cylinders, total 204544 sectors
+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

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index e7443badf454daa5174cd0e00c10945656aca45e..d1e9cc9868e2d577136123a4f1019043a2663e4d 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -21,8 +21,7 @@ Last sector, +sectors or +size{K,M,G} (53248-104447, default 104447): Using defa
 Partition 2 of type Linux and of size 25 MiB is set
 
 Command (m for help): 
-Disk /dev/...: 53 MB, 53477376 bytes
-32 heads, 32 sectors/track, 102 cylinders, total 104448 sectors
+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

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 4735109d81ffd4836c139541eb1100d8b37e18b5..b6e45dc0faea54b376c8ca64906e84550ed85134 100644 (file)
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -22,8 +22,7 @@ Select (default p): Partition number (1-4, default 2): First sector (22528-10227
 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): 
-Disk /dev/md8: 52 MB, 52363264 bytes
-2 heads, 4 sectors/track, 12784 cylinders, total 102272 sectors
+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