Two fixups for quota tests
cover Two fixups for quota tests
Hello,
the two patches in this series fix up false test failures in generic/235 and generic/382 tests for ext2/ext3. In both cases the problem is the tests assume particular amount of blocks is consumed but this is not the case for ext2/ext3 due to indirect blocks.
Honza
PATCH 1/2 generic/382: Make test independent of fs allocation
Test generic/382 depends on filesystem allocating exactly 30M of blocks when writing 30M file. This is not true for some filesystems - e.g. for ext2 due to indirect blocks - while leads to false positive failures. In this case, the test is not actually interested in comparing exact usage, rather in verifying the ability to write 30M worth of data. So instead of comparing 'xfs_quota report' output, just depend on detecting error when writing files.
--- tests/generic/382 | 9 ++------- tests/generic/382.out | 12 ------------ 2 files changed, 2 insertions(+), 19 deletions(-)
tests/generic/382 +2 -7
@@ -67,21 +67,16 @@ do_test() $XFS_QUOTA_PROG -x -c "report $type -N -bi" $SCRATCH_MNT | grep -v ^root | _filter_spaces ## blocks default quota test ## - _user_do "$XFS_IO_PROG -f -c \"pwrite 0 30M\" -c \"fsync\" $SCRATCH_MNT/data" | _filter_xfs_io - echo "$qname blocks quota after write 30M data" - $XFS_QUOTA_PROG -x -c "report $type -N -b" $SCRATCH_MNT | grep -v ^root | _filter_spaces + _user_do "$XFS_IO_PROG -f -c \"pwrite 0 30M\" -c \"fsync\" $SCRATCH_MNT/data" 2>&1 | _filter_xfs_io rm -f ${SCRATCH_MNT}/* >/dev/null 2>&1 ## inode default quota test ## for ((i=0; i<30; i++));do - _user_do "echo -n > ${SCRATCH_MNT}/file${i}" + _user_do "echo -n > ${SCRATCH_MNT}/file${i}" 2>&1 done sync - echo "$qname inode quota after creating 30 inodes" - $XFS_QUOTA_PROG -x -c "report $type -N -i" $SCRATCH_MNT | grep -v ^root | _filter_spaces - rm -f ${SCRATCH_MNT}/* >/dev/null 2>&1 }
tests/generic/382.out +0 -12
@@ -5,21 +5,9 @@ fsgqa 0 40960 40960 00 [--------] 0 40 40 00 [--------] wrote 31457280/31457280 bytes at offset 0 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -user blocks quota after write 30M data -fsgqa 30720 40960 40960 00 [--------] - -user inode quota after creating 30 inodes -fsgqa 30 40 40 00 [--------] - === group quota test === group blocks and inode limit fsgqa 0 40960 40960 00 [--------] 0 40 40 00 [--------] wrote 31457280/31457280 bytes at offset 0 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -group blocks quota after write 30M data -fsgqa 30720 40960 40960 00 [--------] - -group inode quota after creating 30 inodes -fsgqa 30 40 40 00 [--------] -
Signature · 1 line
2.16.4
PATCH 2/2 generic/235: Fix false failure on ext2
In reply to Jan KaraThe test gives false failure on ext2 filesystem as 64k file already has indirect block and so space usage does not exactly match expectation. The test really needs to verify only whether quota accounting got reenabled so just test using creating another empty file which is not prone to these problems.
--- tests/generic/235 | 5 +++-- tests/generic/235.out | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
tests/generic/235 +3 -2
@@ -55,8 +55,9 @@ _try_scratch_mount "-o remount,ro" 2>&1 | tee -a $seqres.full | _filter_scratch touch $SCRATCH_MNT/failed 2>&1 | tee -a $seqres.full | _filter_scratch _try_scratch_mount "-o remount,rw" 2>&1 | tee -a $seqres.full | _filter_scratch -$XFS_IO_PROG -c 'pwrite 0 64k' -c 'fsync' \ - $SCRATCH_MNT/testfile >>$seqres.full 2>&1 +touch $SCRATCH_MNT/testfile2 +chown $qa_user:$qa_user $SCRATCH_MNT/testfile2 + do_repquota _scratch_unmount 2>/dev/null
tests/generic/235.out +2 -2
@@ -17,10 +17,10 @@ Block grace time: 7days; Inode grace time: 7days Block limits File limits User used soft hard grace used soft hard grace ---------------------------------------------------------------------- -fsgqa -- 64 0 0 1 0 0 +fsgqa -- 0 0 0 2 0 0 *** Report for group quotas on device SCRATCH_DEV Block grace time: 7days; Inode grace time: 7days Block limits File limits Group used soft hard grace used soft hard grace ---------------------------------------------------------------------- -fsgqa -- 64 0 0 1 0 0 +fsgqa -- 0 0 0 2 0 0
Signature · 1 line
2.16.4