apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: add filter to 200 accommodate changed mount output

Browse Source 
The mount binary changed its output w.r.t. red-only devices, and
stopped referring to a "block device."

This broke at least test xfs/200; add a common filter to remove
the "block device" from older mount binary output, and change
the 200.out file to match.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Eric Sandeen
2013-10-06 21:28:01 +00:00
committed by Rich Johnston
parent bd7fd0db64
commit fc671750a5
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xfs/200
+3 -3
View File
@@ -93,7 +93,7 @@ blockdev --setro $SCRATCH_DEV
# -o norecovery is used.
#
echo "mounting filesystem that needs recovery on a read-only device:"
_scratch_mount 2>&1 | _filter_scratch
_scratch_mount 2>&1 | _filter_scratch | _filter_ro_mount
echo "unmounting read-only filesystem"
umount $SCRATCH_MNT 2>&1 | _filter_scratch
@@ -104,7 +104,7 @@ umount $SCRATCH_MNT 2>&1 | _filter_scratch
# data recovery hack.
#
echo "mounting filesystem with -o norecovery on a read-only device:"
_scratch_mount -o norecovery 2>&1 | _filter_scratch
_scratch_mount -o norecovery 2>&1 | _filter_scratch | _filter_ro_mount
echo "unmounting read-only filesystem"
umount $SCRATCH_MNT 2>&1 | _filter_scratch
@@ -117,7 +117,7 @@ blockdev --setrw $SCRATCH_DEV
# the underlying device is not write protected.
#
echo "mounting filesystem that needs recovery with -o ro:"
_scratch_mount -o ro 2>&1 | _filter_scratch
_scratch_mount -o ro 2>&1 | _filter_scratch
# success, all done
echo "*** done"
tests/xfs/200.out
+4 -4
View File
@@ -1,7 +1,7 @@
QA output created by 200
setting device read-only
mounting read-only block device:
mount: block device SCRATCH_DEV is write-protected, mounting read-only
mount: SCRATCH_DEV is write-protected, mounting read-only
touching file on read-only filesystem (should fail)
touch: cannot touch 'SCRATCH_MNT/foo': Read-only file system
unmounting read-only filesystem
@@ -12,12 +12,12 @@ going down:
unmounting shutdown filesystem:
setting device read-only
mounting filesystem that needs recovery on a read-only device:
mount: block device SCRATCH_DEV is write-protected, mounting read-only
mount: cannot mount block device SCRATCH_DEV read-only
mount: SCRATCH_DEV is write-protected, mounting read-only
mount: cannot mount SCRATCH_DEV read-only
unmounting read-only filesystem
umount: SCRATCH_MNT: not mounted
mounting filesystem with -o norecovery on a read-only device:
mount: block device SCRATCH_DEV is write-protected, mounting read-only
mount: SCRATCH_DEV is write-protected, mounting read-only
unmounting read-only filesystem
setting device read-write
mounting filesystem that needs recovery with -o ro: