[1/2] generic/382: Make test independent of fs allocation
diff mbox series

Message ID 20191101110046.24994-2-jack@suse.cz
State New
Headers show
Series
  • Two fixups for quota tests
Related show

Commit Message

Jan Kara Nov. 1, 2019, 11 a.m. UTC
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.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 tests/generic/382     |  9 ++-------
 tests/generic/382.out | 12 ------------
 2 files changed, 2 insertions(+), 19 deletions(-)

Patch
diff mbox series

diff --git a/tests/generic/382 b/tests/generic/382
index 50816f69a915..5ae229052bdc 100755
--- a/tests/generic/382
+++ b/tests/generic/382
@@ -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
 }
 
diff --git a/tests/generic/382.out b/tests/generic/382.out
index ad32ccd334bd..a538ca67368c 100644
--- a/tests/generic/382.out
+++ b/tests/generic/382.out
@@ -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 [--------]
-