diff options
author | Karel Zak | 2017-11-28 10:58:37 +0100 |
---|---|---|
committer | Karel Zak | 2017-11-28 10:58:37 +0100 |
commit | c3487d595510160b1124c90bb27209f4badcdde0 (patch) | |
tree | 5f13f526942e6182a51effc18d8c21a64e121c03 /tests/ts | |
parent | nsenter: fix compiler warning [-Wuninitialized] (diff) | |
download | kernel-qcow2-util-linux-c3487d595510160b1124c90bb27209f4badcdde0.tar.gz kernel-qcow2-util-linux-c3487d595510160b1124c90bb27209f4badcdde0.tar.xz kernel-qcow2-util-linux-c3487d595510160b1124c90bb27209f4badcdde0.zip |
tests: make lsns test more robust
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts')
-rwxr-xr-x | tests/ts/lsns/nsfs | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/tests/ts/lsns/nsfs b/tests/ts/lsns/nsfs index 7f2b46bbe..10955c730 100755 --- a/tests/ts/lsns/nsfs +++ b/tests/ts/lsns/nsfs @@ -21,21 +21,35 @@ TS_DESC="list NSFS for namespaces created by ip-netns-add" . $TS_TOPDIR/functions.sh ts_init "$*" -ts_check_test_command "$TS_CMD_LSNS" - ts_skip_nonroot +ts_check_test_command "$TS_CMD_LSNS" +ts_check_test_command "$TS_CMD_MOUNT" +ts_check_test_command "$TS_CMD_UMOUNT" +ts_check_prog "ip" +ts_check_prog "dd" +ts_check_prog "touch" +ts_check_prog "mkfifo" + ts_cd "$TS_OUTDIR" NAME1=ABC NAME2=XYZ PATH1=/run/netns/$NAME1 PATH2=$TS_OUTDIR/$NAME2 -FIFO=$TS_OUTDIR/UTIL-LINUX-LSNS-TEST-FIFO +FIFO=$TS_OUTDIR/FIFO NULL=/dev/null +function cleanup { + rm $FIFO + + $TS_CMD_UMOUNT $PATH2 + rm -f $PATH2 + ip netns delete $NAME1 +} + ip netns delete $NAME1 2> /dev/null || : -umount $PATH2 2>/dev/null || : +$TS_CMD_UMOUNT $PATH2 2>/dev/null || : rm -f $PATH2 rm -f $FIFO @@ -43,9 +57,12 @@ mkfifo $FIFO if ip netns add $NAME1 && touch ${PATH2} && - mount -o bind ${PATH1} ${PATH2}; then + $TS_CMD_MOUNT -o bind ${PATH1} ${PATH2}; then ip netns exec $NAME1 dd if=$FIFO bs=1 count=2 of=$NULL 2> $NULL & PID=$! +else + cleanup + ts_skip "failed to initialize" fi { dd if=/dev/zero bs=1 count=1 2> $NULL @@ -54,15 +71,11 @@ fi dd if=/dev/zero bs=1 count=1 2> $NULL } > $FIFO -rm $FIFO - -umount $PATH2 -rm -f $PATH2 -ip netns delete $NAME1 - test "$NSFS_NAMES_MLINES" = "$PATH1 $PATH2" && test "$NSFS_NAMES_1LINE" = "$PATH1,$PATH2" echo $? >> $TS_OUTPUT +cleanup + ts_finalize |