From 4b9e3937966f7ddf90e6013c87f73c260963b0ea Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 25 Oct 2022 11:04:20 +0200
Subject: [PATCH] tests: don't print mount hins on terminal

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/ts/mount/fstab-btrfs       | 2 +-
 tests/ts/mount/move              | 2 +-
 tests/ts/mount/remount           | 9 +++++----
 tests/ts/mount/shared-subtree    | 2 +-
 tests/ts/mount/umount-alltargets | 6 +++---
 tests/ts/mount/umount-recursive  | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs
index 0003b5d65f..dff7070471 100755
--- a/tests/ts/mount/fstab-btrfs
+++ b/tests/ts/mount/fstab-btrfs
@@ -51,7 +51,7 @@ DEVICE=$TS_LODEV
 [ -d "$TS_MOUNTPOINT_BIND" ] || mkdir -p "$TS_MOUNTPOINT_BIND"
 mkfs.btrfs -d single -m single $DEVICE &> /dev/null || ts_die "Cannot make btrfs on $DEVICE"
 
-$TS_CMD_MOUNT -o loop "$DEVICE" "$TS_MOUNTPOINT_CREATE"
+$TS_CMD_MOUNT -o loop "$DEVICE" "$TS_MOUNTPOINT_CREATE" &> /dev/null
 pushd . >/dev/null
 cd "$TS_MOUNTPOINT_CREATE"
 mkdir -p d0/dd0/ddd0
diff --git a/tests/ts/mount/move b/tests/ts/mount/move
index 91080e55bb..0dbaaebf7a 100755
--- a/tests/ts/mount/move
+++ b/tests/ts/mount/move
@@ -33,7 +33,7 @@ function mount_and_check {
 	# last arg must be an existing or to-be-mounted mountpoint
 	local mountpoint="${@: -1}"
 
-	$TS_CMD_MOUNT "$@" \
+	$TS_CMD_MOUNT "$@" &> /dev/null \
 		|| ts_die "error: mount $*"
 
 	$TS_CMD_MOUNTPOINT -q "$mountpoint" \
diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index 827436cb88..42da41a224 100755
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -39,15 +39,16 @@ MTAB_FILE="/proc/mounts"
 mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
 # mount read-write
-$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT || ts_die "Cannot mount $TS_MOUNTPOINT"
+$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT &> /dev/null \
+	|| ts_die "Cannot mount $TS_MOUNTPOINT"
 
 # check the mount
 grep -E -q "^$DEVICE $TS_MOUNTPOINT" $MTAB_FILE \
- || ts_die "Cannot find $TS_MOUNTPOINT in $MTAB_FILE"
+	 || ts_die "Cannot find $TS_MOUNTPOINT in $MTAB_FILE"
 
 # remount
-$TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
- || ts_die "Cannot remount $TS_MOUNTPOINT"
+$TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT &> /dev/null \
+	 || ts_die "Cannot remount $TS_MOUNTPOINT"
 
 # check the remount
 $TS_CMD_FINDMNT --kernel --mountpoint "$TS_MOUNTPOINT" --options "ro" &> /dev/null
diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index 44b460b57c..cb43ade57c 100755
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -17,7 +17,7 @@ ts_check_prog "mkfs.ext2"
 [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT
 
 # bind
-$TS_CMD_MOUNT --bind $TS_MOUNTPOINT $TS_MOUNTPOINT
+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT $TS_MOUNTPOINT &> /dev/null
 [ "$?" = "0" ] || ts_die "error: mount --bind"
 
 # check the bind
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index ccf612c89e..4ee4761e0e 100755
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -107,11 +107,11 @@ ts_finalize_subtest
 ts_init_subtest "all-targets-recursive"
 multi_mount ${TS_DEVICE}1 $MOUNTPOINT
 [ -d "${MOUNTPOINT}1/subA" ] || mkdir -p ${MOUNTPOINT}1/subA
-$TS_CMD_MOUNT ${TS_DEVICE}2 ${MOUNTPOINT}1/subA
+$TS_CMD_MOUNT ${TS_DEVICE}2 ${MOUNTPOINT}1/subA &> /dev/null
 [ -d "${MOUNTPOINT}1/subA/subAB" ] || mkdir -p ${MOUNTPOINT}1/subA/subAB
-$TS_CMD_MOUNT ${TS_DEVICE}3 ${MOUNTPOINT}1/subA/subAB
+$TS_CMD_MOUNT ${TS_DEVICE}3 ${MOUNTPOINT}1/subA/subAB &> /dev/null
 [ -d "${MOUNTPOINT}1/subB" ] || mkdir -p ${MOUNTPOINT}1/subB
-$TS_CMD_MOUNT ${TS_DEVICE}4 ${MOUNTPOINT}1/subB
+$TS_CMD_MOUNT ${TS_DEVICE}4 ${MOUNTPOINT}1/subB &> /dev/null
 $TS_CMD_UMOUNT --recursive --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>> $TS_ERRLOG
 [ $? == 0 ] || ts_log "umount failed"
 ts_finalize_subtest
diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index 700c58c12e..17c3f26fe6 100755
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -67,7 +67,7 @@ ts_log "Do tests..."
 
 ts_log "A) Mount root"
 $TS_CMD_MOUNT ${TS_DEVICE}1 $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_MOUNT --make-shared $TS_MOUNTPOINT
+$TS_CMD_MOUNT --make-shared $TS_MOUNTPOINT &> /dev/null
 
 ts_log "B) Mount child"
 mkdir -p $TS_MOUNTPOINT/mntB
@@ -86,7 +86,7 @@ $TS_CMD_MOUNT ${TS_DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>> $TS_ERRLO
 
 ts_log "E) Mount child-bind"
 mkdir -p $TS_MOUNTPOINT/bindC
-$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB/mntC $TS_MOUNTPOINT/bindC
+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB/mntC $TS_MOUNTPOINT/bindC &> /dev/nul
 
 udevadm settle
 $TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-- 
2.47.2