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

generic/235: Fix false failures for some quota formats

Browse Source 
Different quota format may print additional information in
repquota(8) output after standard quota information is printed. If
format does support this additional printouts, repquota(8) will
separate possible output by two empty lines even if format handler
doesn't actually printout anything (which is currently always the
case for queries test generic/235 does). If format doesn't support
additional printouts, these two empty lines are not present in the
output. This inconsistency causes false failures for some quota
formats.

Fix the problem by filtering out empty lines out of repquota(8)
output.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Jan Kara
2016-07-21 10:55:06 +02:00
committed by Eryu Guan
parent fc2b488fd4
commit 6721ab08bd
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/generic/235
+7 -2
View File
@@ -46,6 +46,11 @@ _require_scratch
_require_quota
_require_user
do_repquota()
{
repquota -u -g $SCRATCH_MNT | grep -v -E '^root|^$' | _filter_scratch
}
# real QA test starts here
rm -f $seqres.full
@@ -57,7 +62,7 @@ quotaon $SCRATCH_MNT 2>/dev/null
touch $SCRATCH_MNT/testfile
chown $qa_user:$qa_user $SCRATCH_MNT/testfile
repquota -u -g $SCRATCH_MNT | grep -v "^root" | _filter_scratch
do_repquota
# If remount fails with this problem:
#
@@ -70,7 +75,7 @@ _scratch_mount "-o remount,rw" 2>&1 | tee -a $seqres.full | _filter_scratch
$XFS_IO_PROG -c 'pwrite 0 8k' -c 'fsync' \
$SCRATCH_MNT/testfile >>$seqres.full 2>&1
repquota -u -g $SCRATCH_MNT | grep -v "^root" | _filter_scratch
do_repquota
_scratch_unmount 2>/dev/null
tests/generic/235.out
-8
View File
@@ -5,16 +5,12 @@ Block grace time: 7days; Inode grace time: 7days
User used soft hard grace used soft hard grace
----------------------------------------------------------------------
fsgqa -- 0 0 0 1 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 -- 0 0 0 1 0 0
touch: cannot touch 'SCRATCH_MNT/failed': Read-only file system
*** Report for user quotas on device SCRATCH_DEV
Block grace time: 7days; Inode grace time: 7days
@@ -22,13 +18,9 @@ Block grace time: 7days; Inode grace time: 7days
User used soft hard grace used soft hard grace
----------------------------------------------------------------------
fsgqa -- 8 0 0 1 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 -- 8 0 0 1 0 0