[3/3] generic/050: Consistently remove traling dot from umount output
diff mbox series

Message ID 20191111144953.23871-4-jack@suse.cz
State New
Headers show
Series
  • Fix generic/050 for filesystems without journal
Related show

Commit Message

Jan Kara Nov. 11, 2019, 2:49 p.m. UTC
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(-)

Patch
diff mbox series

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