From e0884798713ce1ece9381d9f657432774ac4c44e Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 11 Nov 2019 15:49:52 +0100 Subject: [PATCH] generic/050: Handle xfs quota special case with different output Instead of faking output for the case of XFS with quotas, just use a different output file with appropriate output. Signed-off-by: Jan Kara Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/generic/050 | 62 ++++++++++------------------------ tests/generic/050.cfg | 1 + tests/generic/050.out.xfsquota | 25 ++++++++++++++ 3 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 tests/generic/050.out.xfsquota diff --git a/tests/generic/050 b/tests/generic/050 index a8d648e5..1c275d8b 100755 --- a/tests/generic/050 +++ b/tests/generic/050 @@ -39,27 +39,15 @@ _require_norecovery features="" if ! _has_metadata_journaling $SCRATCH_DEV >/dev/null; then features="nojournal" +elif [ "$FSTYP" = "xfs" ] && echo "$MOUNT_OPTIONS" | grep -q quota ; then + # Mounting with quota on XFS requires a writable fs, which means + # we expect to fail the ro blockdev test with with EPERM. + features="xfsquota" fi _link_out_file "$features" _scratch_mkfs >/dev/null 2>&1 -filter_ro_mount() { - local arg="" - - if [ -n "$expect_mount_failure" ]; then - arg="s|mount: $SCRATCH_MNT: permission denied|mount: device write-protected, mounting read-only|g" - fi - sed -e "$arg" | _filter_ro_mount -} - -# Mounting with quota on XFS requires a writable fs, which means -# we expect to fail the ro blockdev test with with EPERM. -expect_mount_failure= -if [ "$FSTYP" = "xfs" ] && echo "$MOUNT_OPTIONS" | grep -q quota ; then - expect_mount_failure=1 -fi - # # Mark the device read-only # @@ -70,25 +58,16 @@ blockdev --setro $SCRATCH_DEV # Mount it, and make sure we can't write to it, and we can unmount it again # echo "mounting read-only block device:" -_try_scratch_mount 2>&1 | filter_ro_mount -if [ "${PIPESTATUS[0]}" -eq 0 ]; then - echo "touching file on read-only filesystem (should fail)" - touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch - - # - # Apparently this used to be broken at some point: - # http://oss.sgi.com/bugzilla/show_bug.cgi?id=807 - # - echo "unmounting read-only filesystem" - _scratch_unmount 2>&1 | _filter_scratch -elif [ -n "${expect_mount_failure}" ]; then - # Mount failed, so simulate EROFS instead of scribbling on root fs - echo "touching file on read-only filesystem (should fail)" - echo "touch: cannot touch 'SCRATCH_MNT/foo': Read-only file system" - echo "unmounting read-only filesystem" -else - echo "Mount failed, though it wasn't supposed to!" -fi +_try_scratch_mount 2>&1 | _filter_ro_mount +echo "touching file on read-only filesystem (should fail)" +touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch + +# +# Apparently this used to be broken at some point: +# http://oss.sgi.com/bugzilla/show_bug.cgi?id=807 +# +echo "unmounting read-only filesystem" +_scratch_unmount 2>&1 | _filter_scratch echo "setting device read-write" blockdev --setrw $SCRATCH_DEV @@ -124,16 +103,9 @@ _scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot # data recovery hack. # echo "mounting filesystem with -o norecovery on a read-only device:" -_try_scratch_mount -o norecovery 2>&1 | filter_ro_mount -if [ "${PIPESTATUS[0]}" -eq 0 ]; then - echo "unmounting read-only filesystem" - _scratch_unmount 2>&1 | _filter_scratch -elif [ -n "${expect_mount_failure}" ]; then - # Mount failed, simulate correct output - echo "unmounting read-only filesystem" -else - echo "Mount failed, though it wasn't supposed to!" -fi +_try_scratch_mount -o norecovery 2>&1 | _filter_ro_mount +echo "unmounting read-only filesystem" +_scratch_unmount 2>&1 | _filter_scratch echo "setting device read-write" blockdev --setrw $SCRATCH_DEV diff --git a/tests/generic/050.cfg b/tests/generic/050.cfg index c76bd473..1d9d60bc 100644 --- a/tests/generic/050.cfg +++ b/tests/generic/050.cfg @@ -1 +1,2 @@ nojournal: nojournal +xfsquota: xfsquota diff --git a/tests/generic/050.out.xfsquota b/tests/generic/050.out.xfsquota new file mode 100644 index 00000000..49b46241 --- /dev/null +++ b/tests/generic/050.out.xfsquota @@ -0,0 +1,25 @@ +QA output created by 050 +setting device read-only +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. +setting device read-write +mounting read-write block device: +touch files +going down: +unmounting shutdown filesystem: +setting device read-only +mounting filesystem that needs recovery on a read-only device: +mount: device write-protected, mounting read-only +mount: cannot mount device read-only +unmounting read-only filesystem +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. +setting device read-write +mounting filesystem that needs recovery with -o ro: +*** done -- 2.30.2