c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enable quota_002_pos, quota_004_pos and quota_005_pos

Browse Source 
In this test the 'ls -ls' command was used to print testfile size in
blocks.  Because the environment variable BLOCK_SIZE was set
the 'ls -ls' command detected this and output its block count as the
number of 8192 blocks.  Rather than change the variable name
the -k was was added to force ls to return 1k blocks.  This has the
additional advantage of behaving consistently across platforms.

For additional details on GNU 'ls' behavior regarding block size:

https://www.gnu.org/software/coreutils/manual/html_node/Block-size.html

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: yuxiang <guo.yong33@zte.com.cn>
Closes #5269
This commit is contained in:
liaoyuxiangqin 2016-10-15 00:33:51 +08:00 committed by Brian Behlendorf
parent 5f014a0cc4
commit 21237e9167
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/runfiles/linux.run
View File

@ -500,12 +500,9 @@ tests = ['poolversion_001_pos', 'poolversion_002_pos']
#[tests/functional/privilege]
#tests = ['privilege_001_pos', 'privilege_002_pos']
# DISABLED:
# quota_002_pos - size is less than current used or reserved space
# quota_004_pos - size is less than current used or reserved space
# quota_005_pos - size is less than current used or reserved space
[tests/functional/quota]
tests = ['quota_001_pos', 'quota_003_pos', 'quota_006_neg']
tests = ['quota_001_pos', 'quota_002_pos', 'quota_003_pos',
'quota_004_pos', 'quota_005_pos', 'quota_006_neg']
[tests/functional/raidz]
tests = ['raidz_001_neg', 'raidz_002_pos']

4
tests/zfs-tests/tests/functional/quota/quota.kshlib
View File

@ -60,9 +60,9 @@ function fill_quota
[[ $zret -ne $EDQUOT ]] && \
log_fail "Returned error code: $zret. Expected: $EDQUOT."
typeset -i file_size=`$LS -ls $MNTPT/$TESTFILE1 | $AWK '{ print $1 }'`
typeset -i file_size=`$LS -lsk $MNTPT/$TESTFILE1 | $AWK '{ print $1 }'`
typeset -i limit=0
(( file_size = file_size * 512 ))
(( file_size = file_size * 1024 ))
(( limit = QUOTA_VALUE + TOLERANCE ))
(( file_size > limit )) && \
log_fail "File was created larger than the quota value, aborting!!!"

2
tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh
View File

@ -42,7 +42,7 @@
# 1) Apply quota to the ZFS file system
# 2) Exceed the quota
# 3) Attempt to write another file
# 4) Verify the attempt fails with error code 49 (EDQUOTA)
# 4) Verify the attempt fails with error code EDQUOTA (linux 122, others 49)
#
#

2
tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh
View File

@ -42,7 +42,7 @@
# 1) Apply quota to the ZFS file system dataset
# 2) Exceed the quota
# 3) Attempt to write another file
# 4) Verify the attempt fails with error code 49 (EDQUOTA)
# 4) Verify the attempt fails with error code EDQUOTA (linux 122, others 49)
#
#