generic/050: Consistently remove traling dot from umount output

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>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/generic/050 b/tests/generic/050
index 1c275d8b0601864f329eb1143edbf7be314b4ed2..cf2b93814267c22842600d5dc7cf5fd68e1cefa3 100755 (executable)
--- 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"
 #      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
 
 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"
 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
 
 echo "setting device read-write"
 blockdev --setrw $SCRATCH_DEV

diff --git a/tests/generic/050.out.xfsquota b/tests/generic/050.out.xfsquota
index 49b46241b39fcbefb9022e029fd590da5459f0ba..f204bd2fbe70c722a661a511c13ef124e0142ec6 100644 (file)
--- 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
 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
 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
 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
 setting device read-write
 mounting filesystem that needs recovery with -o ro:
 *** done