From: Karel Zak <kzak@redhat.com>
Date: Thu, 26 Jul 2012 16:47:59 +0000 (+0200)
Subject: tests: update blkid tests with fdisk output
X-Git-Tag: v2.22-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f716938200c4e606fea9308f729b2c581a6687d2;p=thirdparty%2Futil-linux.git

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 002c2c01e0..f2560af7a7 100644
--- 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 bc8085fcc4..d9c44665e7 100644
--- 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 e7443badf4..d1e9cc9868 100644
--- 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 4735109d81..b6e45dc0fa 100644
--- 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