From: Jan Kara <jack@suse.cz>
To: <fstests@vger.kernel.org>
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>,
Eryu Guan <guaneryu@gmail.com>, Jan Kara <jack@suse.cz>
Subject: [PATCH 3/3] generic/050: Consistently remove traling dot from umount output
Date: Mon, 11 Nov 2019 15:49:53 +0100 [thread overview]
Message-ID: <20191111144953.23871-4-jack@suse.cz> (raw)
In-Reply-To: <20191111144953.23871-1-jack@suse.cz>
We did not consistently remove trailing dot from umount output which can
presumably lead to false failures with particular versions of
util-linux. Make sure all umount output is properly filtered.
Signed-off-by: Jan Kara <jack@suse.cz>
---
tests/generic/050 | 4 ++--
tests/generic/050.out.xfsquota | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/generic/050 b/tests/generic/050
index 1c275d8b0601..cf2b93814267 100755
--- a/tests/generic/050
+++ b/tests/generic/050
@@ -67,7 +67,7 @@ touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
# http://oss.sgi.com/bugzilla/show_bug.cgi?id=807
#
echo "unmounting read-only filesystem"
-_scratch_unmount 2>&1 | _filter_scratch
+_scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot
echo "setting device read-write"
blockdev --setrw $SCRATCH_DEV
@@ -105,7 +105,7 @@ _scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot
echo "mounting filesystem with -o norecovery on a read-only device:"
_try_scratch_mount -o norecovery 2>&1 | _filter_ro_mount
echo "unmounting read-only filesystem"
-_scratch_unmount 2>&1 | _filter_scratch
+_scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot
echo "setting device read-write"
blockdev --setrw $SCRATCH_DEV
diff --git a/tests/generic/050.out.xfsquota b/tests/generic/050.out.xfsquota
index 49b46241b39f..f204bd2fbe70 100644
--- a/tests/generic/050.out.xfsquota
+++ b/tests/generic/050.out.xfsquota
@@ -4,7 +4,7 @@ mounting read-only block device:
mount: /mnt-scratch: permission denied
touching file on read-only filesystem (should fail)
unmounting read-only filesystem
-umount: SCRATCH_DEV: not mounted.
+umount: SCRATCH_DEV: not mounted
setting device read-write
mounting read-write block device:
touch files
@@ -19,7 +19,7 @@ umount: SCRATCH_DEV: not mounted
mounting filesystem with -o norecovery on a read-only device:
mount: /mnt-scratch: permission denied
unmounting read-only filesystem
-umount: SCRATCH_DEV: not mounted.
+umount: SCRATCH_DEV: not mounted
setting device read-write
mounting filesystem that needs recovery with -o ro:
*** done
--
2.16.4
prev parent reply other threads:[~2019-11-11 14:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 14:49 [PATCH 0/3 v2] Fix generic/050 for filesystems without journal Jan Kara
2019-11-11 14:49 ` [PATCH 1/3] generic/050: Fix test failure " Jan Kara
2019-11-11 14:49 ` [PATCH 2/3] generic/050: Handle xfs quota special case with different output Jan Kara
2019-11-11 14:49 ` Jan Kara [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191111144953.23871-4-jack@suse.cz \
--to=jack@suse.cz \
--cc=darrick.wong@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).