From 03700127a7254e61e34ecc24e0bca8c23de4bc02 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 19 Dec 2017 13:46:35 +0100 Subject: tests: don't use mount. helpers in mount-by-pattern tests The test behavior is fragile if depends on external helpers. Let's keep it based on mount(2) only. The test will be faster too. Note that "mount -t " does not behaviour as expected with helpers. We need to try another helper if the current one ends with status=1 (waitpid()). Now it returns status from the first helper. Reported-by: Ruediger Meier Signed-off-by: Karel Zak --- tests/ts/mount/fslists | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists index 64859ba38..de485319a 100755 --- a/tests/ts/mount/fslists +++ b/tests/ts/mount/fslists @@ -71,7 +71,7 @@ ts_finalize_subtest ts_init_subtest "type-pattern" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -t nofoo,bar $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -i -t nofoo,bar $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT ts_log "Success" @@ -80,7 +80,7 @@ ts_finalize_subtest ts_init_subtest "type-pattern-neg" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -t nofoo,bar,ext3,ext2,ext4 $DEVICE $TS_MOUNTPOINT &> /dev/null +$TS_CMD_MOUNT -i -t nofoo,bar,ext3,ext2,ext4 $DEVICE $TS_MOUNTPOINT &> /dev/null ts_is_mounted $DEVICE && ts_die "$DEVICE unexpectedly mounted" ts_log "Success" ts_finalize_subtest -- cgit v1.2.3-55-g7522