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/60[01]: fix test failure when setting new grace limit

Browse Source 
The setquota command can extend a quota grace period by a certain number
of seconds.  The extension is provided as a number of seconds relative
to right now.  However, if the system clock increments the seconds count
after this test assigns $now but before setquota gets called, the test
will fail because $get and $set will be off by that 1 second.  Allow for
that.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2020-09-14 18:43:08 -07:00
committed by Eryu Guan
parent d40de4f744
commit 4f9dd73596
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/generic/600
+3 -1
View File
@@ -60,7 +60,9 @@ let set=now+100
setquota -T -u $qa_user 0 100 $SCRATCH_MNT 2>&1 | grep -v "^setquota"
get=`repquota -up $SCRATCH_MNT | grep "^$qa_user" | awk '{print $NF}'`
if [ "$get" != "$set" ]; then
# Either the new expiry must match; or be one second after the set time, to
# deal with the seconds counter incrementing.
if [ "$get" != "$set" ] && [ "$get" -ne "$((set + 1))" ]; then
echo "set grace to $set but got grace $get"
fi
tests/generic/601
+3 -1
View File
@@ -71,7 +71,9 @@ $XFS_QUOTA_PROG -x -c "timer -u -i 100 $qa_user" $SCRATCH_MNT
# raw ("since epoch") grace expiry
get=`repquota -up $SCRATCH_MNT | grep "^$qa_user" | awk '{print $NF}'`
if [ "$get" != "$set" ]; then
# Either the new expiry must match; or be one second after the set time, to
# deal with the seconds counter incrementing.
if [ "$get" != "$set" ] && [ "$get" -ne "$((set + 1))" ]; then
echo "set grace to $set but got grace $get"
fi