tests: use stable MBR ID

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

diff --git a/tests/expected/blkid/lowprobe-pt-dos+bsd b/tests/expected/blkid/lowprobe-pt-dos+bsd
index 0f992a52609beefdb7e8c842d6216fa61aec3b19..099e98c23e4f50008c1502612d72f0a5bbe81207 100644 (file)
--- a/tests/expected/blkid/lowprobe-pt-dos+bsd
+++ b/tests/expected/blkid/lowprobe-pt-dos+bsd
@@ -1,6 +1,6 @@
-size: 8388608, sector size: 512, PT: dos, offset: 446, id=0x8f8378c0
+size: 8388608, sector size: 512, PT: dos, offset: 446, id=8f8378c0
 ---
-#1:         32       7648  0x83
-#2:       7680       8704  0xa5
+#1:         32       7648  0x83 uuid='8f8378c0-01'
+#2:       7680       8704  0xa5 uuid='8f8378c0-02'
 #5:       7936       4864  0x7 (freebsd)
 #6:      12544       3584  0x7 (freebsd)

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index f409952203eb1dbc9a9424d81c4fac7cbd28f79c..2f34ecf4bb66d51e6a0063e619e1079a66a38722 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -39,6 +39,7 @@ Syncing disks.
 Create RAID1 device
 Probe whole-disk
 ID_PART_TABLE_TYPE=dos
+ID_PART_TABLE_UUID=00000001
 Probe first RAID member
 ID_FS_TYPE=linux_raid_member
 ID_FS_USAGE=raid
@@ -51,6 +52,7 @@ ID_PART_ENTRY_OFFSET=2048
 ID_PART_ENTRY_SCHEME=dos
 ID_PART_ENTRY_SIZE=51200
 ID_PART_ENTRY_TYPE=0x83
+ID_PART_ENTRY_UUID=00000001-01
 Probe second RAID member
 ID_FS_TYPE=linux_raid_member
 ID_FS_USAGE=raid
@@ -63,3 +65,4 @@ ID_PART_ENTRY_OFFSET=53248
 ID_PART_ENTRY_SCHEME=dos
 ID_PART_ENTRY_SIZE=51200
 ID_PART_ENTRY_TYPE=0x83
+ID_PART_ENTRY_UUID=00000001-02

diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 46bde0ec840d3553bef16bce2240411569ff98b9..30900eae6ccd5cdfbe5e211f89ad659aa894a812 100755 (executable)
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -42,6 +42,16 @@ w
 q
 EOF
 
+# replace generated ID with something stable
+$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF
+x
+i
+0x1
+r
+w
+q
+EOF
+
 udevadm settle
 MD_DEVNAME=md8
 MD_DEVICE=/dev/${MD_DEVNAME}