diff options
author | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
---|---|---|
committer | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
commit | 0692b963aa3cb846d8abab5ef5247c4dbb3fec96 (patch) | |
tree | f13776d25da3e1adc1445aef22e7566ac98cbe84 /tests/ts/partx/partx | |
parent | losetup: added file format option to the man page (diff) | |
parent | partx: document -d vs. --nr and fix test (diff) | |
download | kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.gz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.xz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.zip |
lib/losetup: merge remote-tracking branch 'util-linux/master'kernel-qcow2
Signed-off-by: Manuel Bentele <development@manuel-bentele.de>
Diffstat (limited to 'tests/ts/partx/partx')
-rwxr-xr-x | tests/ts/partx/partx | 9 |
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 |