From: Karel Zak <kzak@redhat.com>
Date: Thu, 16 Feb 2017 10:01:35 +0000 (+0100)
Subject: tests: use swap in sfdisk wipe test
X-Git-Tag: v2.30-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab3d8937843c07da8e4ea62a05032ccde0187ea5;p=thirdparty%2Futil-linux.git

tests: use swap in sfdisk wipe test

and add "udevadm settle".

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

diff --git a/tests/expected/sfdisk/wipe-partition b/tests/expected/sfdisk/wipe-partition
index f447c585e2..a73b399771 100644
--- a/tests/expected/sfdisk/wipe-partition
+++ b/tests/expected/sfdisk/wipe-partition
@@ -30,7 +30,7 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Created a new <removed>.
 <removed>1: Created a new <removed>.
-Partition #1 contains a ext4 signature.
+Partition #1 contains a swap signature.
 The signature will be removed by a write command.
 <removed>2: Done.
 
diff --git a/tests/ts/sfdisk/wipe b/tests/ts/sfdisk/wipe
index 3739e81e98..e73e31186a 100755
--- a/tests/ts/sfdisk/wipe
+++ b/tests/ts/sfdisk/wipe
@@ -23,7 +23,6 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_SFDISK"
 ts_check_test_command "$TS_CMD_WIPEFS"
 ts_check_test_command "$TS_CMD_MKSWAP"
-ts_check_prog "mkfs.ext4"
 
 ts_skip_nonroot
 
@@ -65,14 +64,15 @@ ts_finalize_subtest
 ts_init_subtest "fs-to-dos"
 ts_separator "Create FS"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
 $TS_CMD_MKSWAP ${TS_DEVICE} &> /dev/null
 udevadm settle
 ts_separator "Create DOS"
 echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always  --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
+udevadm settle
 ts_separator "Check content"
 $TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
-udevadm settle
 ts_finalize_subtest
 
 
@@ -83,19 +83,20 @@ udevadm settle
 echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 udevadm settle
 ts_separator "Create FS in partition"
-mkfs.ext4 ${TS_DEVICE}1 &> /dev/null
+$TS_CMD_MKSWAP ${TS_DEVICE}1 &> /dev/null
 udevadm settle
 ts_separator "Wipe whole-disk device"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
 ts_separator "Create GPT (again)"
 echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --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_separator "Check content (partition)"
 $TS_CMD_WIPEFS ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1
 ts_fdisk_clean $TS_DEVICE
-udevadm settle
 ts_finalize_subtest
 
+udevadm settle
 ts_finalize