summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKarel Zak2019-08-21 13:42:22 +0200
committerKarel Zak2019-08-21 13:42:22 +0200
commit5200aa99d27e084b514e8b035db32f39b49562a3 (patch)
tree2098b6d12f64e74b996e3629c0155744e8848be9 /tests
parentpartx: don't report ENXIO as error on -d (diff)
downloadkernel-qcow2-util-linux-master.tar.gz
kernel-qcow2-util-linux-master.tar.xz
kernel-qcow2-util-linux-master.zip
partx: document -d vs. --nr and fix testHEADmaster
The commit ab025087f91b66ee8e23a16bc49eb0d9bd421d65 has disabled error message, but unfortunately it keeps wrong return code. This has been fixed by commit 53ae7d60cfeacd4e87bfe6fcc015b58b78ef4555. This commit add hit about it to docs and fix regression test too. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/ts/partx/partx9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx
index b21dc44ef..84c286a94 100755
--- a/tests/ts/partx/partx
+++ b/tests/ts/partx/partx
@@ -137,9 +137,14 @@ udevadm settle
ts_init_subtest "delete-non-existent"
#attempt to remove it again
{
+ # remove non-existing partitions (ENXIO) is not error
+ #
+ # see ab025087f91b66ee8e23a16bc49eb0d9bd421d65 and
+ # 53ae7d60cfeacd4e87bfe6fcc015b58b78ef4555
+ #
$TS_CMD_PARTX -d --nr $PARTS $TS_DEVICE &&
- echo "partx failed: removed non-existing partition" ||
- echo "partx: OK"
+ echo "partx: OK" ||
+ echo "partx failed: removed non-existing partition"
} >$TS_OUTPUT 2>&1
ts_finalize_subtest