mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfstests 050: ignore duplicates reported by repquota
Arrange to ignore duplicate entries reported by the "repquota" xfs_quota command. This can happen if an id is used more than once (such as when two user names are assigned the same uid). Since we are already sorting the output we can accomplish this by adding the "-u" (unique) option to the sort command. Shorten some long lines while we're at it. Signed-off-by: Alex Elder <aelder@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
@@ -118,7 +118,9 @@ _exercise()
|
||||
|
||||
echo
|
||||
echo "*** report no quota settings" | tee -a $seq.full
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x -c "repquota -birnN -$type" $SCRATCH_DEV | _filter_report | LC_COLLATE=POSIX sort -r
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
-c "repquota -birnN -$type" $SCRATCH_DEV |
|
||||
_filter_report | LC_COLLATE=POSIX sort -ru
|
||||
|
||||
echo
|
||||
echo "*** report initial settings" | tee -a $seq.full
|
||||
@@ -129,20 +131,26 @@ _exercise()
|
||||
-c "limit -$type bsoft=${bsoft}k bhard=${bhard}k $id" \
|
||||
-c "limit -$type isoft=$isoft ihard=$ihard $id" \
|
||||
$SCRATCH_DEV
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x -c "repquota -birnN -$type" $SCRATCH_DEV | _filter_report | LC_COLLATE=POSIX sort -r
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
-c "repquota -birnN -$type" $SCRATCH_DEV |
|
||||
_filter_report | LC_COLLATE=POSIX sort -ru
|
||||
|
||||
echo
|
||||
echo "*** push past the soft inode limit" | tee -a $seq.full
|
||||
_file_as_id $SCRATCH_MNT/softie1 $id $type 1024 0
|
||||
_file_as_id $SCRATCH_MNT/softie2 $id $type 1024 0
|
||||
_qmount
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x -c "repquota -birnN -$type" $SCRATCH_DEV | _filter_report | LC_COLLATE=POSIX sort -r
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
-c "repquota -birnN -$type" $SCRATCH_DEV |
|
||||
_filter_report | LC_COLLATE=POSIX sort -ru
|
||||
|
||||
echo
|
||||
echo "*** push past the soft block limit" | tee -a $seq.full
|
||||
_file_as_id $SCRATCH_MNT/softie $id $type 1024 140
|
||||
_qmount
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x -c "repquota -birnN -$type" $SCRATCH_DEV | _filter_report | LC_COLLATE=POSIX sort -r
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
-c "repquota -birnN -$type" $SCRATCH_DEV |
|
||||
_filter_report | LC_COLLATE=POSIX sort -ru
|
||||
|
||||
echo
|
||||
# Note: for quota accounting (not enforcement), EDQUOT is not expected
|
||||
@@ -152,7 +160,9 @@ _exercise()
|
||||
_file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0
|
||||
done
|
||||
_qmount
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x -c "repquota -birnN -$type" $SCRATCH_DEV | _filter_report | LC_COLLATE=POSIX sort -r
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
-c "repquota -birnN -$type" $SCRATCH_DEV |
|
||||
_filter_report | LC_COLLATE=POSIX sort -ru
|
||||
|
||||
echo
|
||||
# Note: for quota accounting (not enforcement), EDQUOT is not expected
|
||||
@@ -161,7 +171,9 @@ _exercise()
|
||||
echo "ls -l $SCRATCH_MNT" >>$seq.full
|
||||
ls -l $SCRATCH_MNT >>$seq.full
|
||||
_qmount
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x -c "repquota -birnN -$type" $SCRATCH_DEV | _filter_and_check_blks | LC_COLLATE=POSIX sort -r
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
-c "repquota -birnN -$type" $SCRATCH_DEV |
|
||||
_filter_and_check_blks | LC_COLLATE=POSIX sort -ru
|
||||
|
||||
echo
|
||||
echo "*** unmount"
|
||||
|
||||
Reference in New Issue
Block a user