summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBernhard Voelker2012-07-31 16:36:35 +0200
committerKarel Zak2012-07-31 20:01:33 +0200
commitebb857720fd2ba352d9090ae4a3089fe8201a806 (patch)
treec522d1bda19cbc8a0115265c080589f80ec778fd /tests
parenttests: add non-dos mode fdisk test (diff)
downloadkernel-qcow2-util-linux-ebb857720fd2ba352d9090ae4a3089fe8201a806.tar.gz
kernel-qcow2-util-linux-ebb857720fd2ba352d9090ae4a3089fe8201a806.tar.xz
kernel-qcow2-util-linux-ebb857720fd2ba352d9090ae4a3089fe8201a806.zip
tests: make blkid/md-raid1-part more robust
* tests/expected/blkid/mk-raid1-part: Replace major and minor number of ID_PART_ENTRY_DISK by a special string. Add ID_FS_UUID and ID_FS_UUID_ENC again, also with a special string. * tests/ts/blkid/md-raid1-part: Before comparing the expected output with the actual output, replace the values of ID_PART_ENTRY_DISK, ID_FS_UUID and ID_FS_UUID_ENC with the speacial strings mentioned above. Signed-off-by: Bernhard Voelker <mail@bernhard-voelker.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/blkid/md-raid1-part12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index d1e9cc986..ce93b7340 100644
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -41,10 +41,10 @@ ID_PART_TABLE_TYPE=dos
Probe first RAID member
ID_FS_TYPE=linux_raid_member
ID_FS_USAGE=raid
-
-
+ID_FS_UUID=__ts_uuid__
+ID_FS_UUID_ENC=__ts_uuid_enc__
ID_FS_VERSION=0.90.0
-ID_PART_ENTRY_DISK=8:16
+ID_PART_ENTRY_DISK=__ts_majorminor__
ID_PART_ENTRY_NUMBER=1
ID_PART_ENTRY_OFFSET=2048
ID_PART_ENTRY_SCHEME=dos
@@ -53,10 +53,10 @@ ID_PART_ENTRY_TYPE=0x83
Probe second RAID member
ID_FS_TYPE=linux_raid_member
ID_FS_USAGE=raid
-
-
+ID_FS_UUID=__ts_uuid__
+ID_FS_UUID_ENC=__ts_uuid_enc__
ID_FS_VERSION=0.90.0
-ID_PART_ENTRY_DISK=8:16
+ID_PART_ENTRY_DISK=__ts_majorminor__
ID_PART_ENTRY_NUMBER=2
ID_PART_ENTRY_OFFSET=53248
ID_PART_ENTRY_SCHEME=dos