diff options
| author | Karel Zak | 2017-02-16 11:01:35 +0100 |
|---|---|---|
| committer | Karel Zak | 2017-02-16 11:01:35 +0100 |
| commit | ab3d8937843c07da8e4ea62a05032ccde0187ea5 (patch) | |
| tree | 735f380d10ed5db6c03f2746b93e498a794028ce /tests/ts/sfdisk | |
| parent | rename: add --no-act to bash-completion (diff) | |
| download | kernel-qcow2-util-linux-ab3d8937843c07da8e4ea62a05032ccde0187ea5.tar.gz kernel-qcow2-util-linux-ab3d8937843c07da8e4ea62a05032ccde0187ea5.tar.xz kernel-qcow2-util-linux-ab3d8937843c07da8e4ea62a05032ccde0187ea5.zip | |
tests: use swap in sfdisk wipe test
and add "udevadm settle".
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/sfdisk')
| -rwxr-xr-x | tests/ts/sfdisk/wipe | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/ts/sfdisk/wipe b/tests/ts/sfdisk/wipe index 3739e81e9..e73e31186 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 |