From afeb1a8255638ee28c2f32f23b91c32890ef48dc Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 29 Jun 2017 13:31:35 +0200
Subject: [PATCH] tests: explicitly define wipefs outpuit columns

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/expected/sfdisk/wipe-fs-to-dos       |  4 ++--
 tests/expected/sfdisk/wipe-gpt-to-dos      |  4 ++--
 tests/expected/sfdisk/wipe-gpt-to-dos-auto |  4 ++--
 tests/expected/sfdisk/wipe-partition       |  8 ++++----
 tests/ts/sfdisk/wipe                       | 10 +++++-----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos
index 38e0814e5..f87eb67be 100644
--- 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 f99e626f5..90c654f19 100644
--- 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 558953071..8855859f0 100644
--- 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 ec9d49db8..b1b10162e 100644
--- 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 ed89e9a9c..bba57a86d 100755
--- 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