tests: explicitly define wipefs outpuit columns

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

diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos
index 38e0814e5d0fc6cc272c3ab4ca636543785f7baf..f87eb67be5daaf8d481e0c9a7e6886103346dbfe 100644 (file)
--- a/tests/expected/sfdisk/wipe-fs-to-dos
+++ b/tests/expected/sfdisk/wipe-fs-to-dos
@@ -25,5 +25,5 @@ Device     Boot Start    End Sectors Size Id Type
 The partition table has been altered.
 
 =====Check content================================
-DEVICE OFFSET TYPE UUID LABEL
-sdc    0x1fe  dos       
+OFFSET TYPE
+0x1fe  dos

diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos b/tests/expected/sfdisk/wipe-gpt-to-dos
index f99e626f5cd572a4fb2f3554826fedd4a1f4e52e..90c654f199617b933a7dcb5d1f64e8b1dbe1e004 100644 (file)
--- a/tests/expected/sfdisk/wipe-gpt-to-dos
+++ b/tests/expected/sfdisk/wipe-gpt-to-dos
@@ -45,5 +45,5 @@ Device     Boot Start    End Sectors Size Id Type
 The partition table has been altered.
 
 =====Check content================================
-DEVICE OFFSET TYPE UUID LABEL
-sdc    0x1fe  dos       
+OFFSET TYPE
+0x1fe  dos

diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos-auto b/tests/expected/sfdisk/wipe-gpt-to-dos-auto
index 558953071440b8285f76693db8bb442136fdf98b..8855859f049e5e71e224fb8581bfc82cf1a8be91 100644 (file)
--- a/tests/expected/sfdisk/wipe-gpt-to-dos-auto
+++ b/tests/expected/sfdisk/wipe-gpt-to-dos-auto
@@ -52,5 +52,5 @@ Device     Boot Start    End Sectors Size Id Type
 The partition table has been altered.
 
 =====Check content================================
-DEVICE OFFSET TYPE UUID LABEL
-sdc    0x1fe  dos       
+OFFSET TYPE
+0x1fe  dos

diff --git a/tests/expected/sfdisk/wipe-partition b/tests/expected/sfdisk/wipe-partition
index ec9d49db8faa56fd371b9c0bdf254240a1ff4150..b1b10162e1367e8f991c24922cec1ac0fb49e743 100644 (file)
--- a/tests/expected/sfdisk/wipe-partition
+++ b/tests/expected/sfdisk/wipe-partition
@@ -50,9 +50,9 @@ Calling ioctl() to re-read partition table.
 Syncing disks.
 
 =====Check content (disk)================================
-DEVICE OFFSET    TYPE UUID LABEL
-sdc    0x1fe     PMBR      
-sdc    0x31ffe00 gpt       
-sdc    0x200     gpt       
+OFFSET    TYPE
+0x1fe     PMBR
+0x31ffe00 gpt
+0x200     gpt
 
 =====Check content (partition)================================

diff --git a/tests/ts/sfdisk/wipe b/tests/ts/sfdisk/wipe
index ed89e9a9ce69548dcba88a7130bfe4fb2d2dbc80..bba57a86d9a8a60cae6c92a235533d1094a63bab 100755 (executable)
--- a/tests/ts/sfdisk/wipe
+++ b/tests/ts/sfdisk/wipe
@@ -41,7 +41,7 @@ echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE}
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_separator "Check content"
-$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_finalize_subtest
 
 
@@ -57,7 +57,7 @@ echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=dos ${TS_DEVICE} >> $TS_OUTPUT
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_separator "Check content"
-$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_finalize_subtest
 
 
@@ -72,7 +72,7 @@ echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always  --label=dos ${TS_DEVICE}
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_separator "Check content"
-$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_finalize_subtest
 
 
@@ -92,10 +92,10 @@ ts_separator "Create GPT (again)"
 echo ',,L' | $TS_CMD_SFDISK --no-reread --wipe-partition=always --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 udevadm settle
 ts_separator "Check content (disk)"
-$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 udevadm settle
 ts_separator "Check content (partition)"
-$TS_CMD_WIPEFS ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest