Enable quota_002_pos, quota_004_pos and quota_005_pos

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

diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index 91babd76e09cf2b520fb309ac9d27bdb5d867cd7..5764bb8f919da4eaa37cdcb1856a63cabbe2790e 100644 (file)
--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
@@ -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']

diff --git a/tests/zfs-tests/tests/functional/quota/quota.kshlib b/tests/zfs-tests/tests/functional/quota/quota.kshlib
index 3805a447bd22eb17a6dd81bfc27024c671267817..bde0a37e29d9b162616e4c30737a26f65c692d7d 100644 (file)
--- a/tests/zfs-tests/tests/functional/quota/quota.kshlib
+++ b/tests/zfs-tests/tests/functional/quota/quota.kshlib
@@ -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!!!"

diff --git a/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh b/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh
index 3b8ba668acce9a942dee6e1ccaddf428113e1fdf..6de5feafb271a055254a201c650f97853ade42a5 100755 (executable)
--- a/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh
@@ -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)
 #
 #
 

diff --git a/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh b/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh
index def8b2b37dfcff825d837ca39c2c985f47a77035..50106cad7af7068b4f23e08400e42e45c2ea3cc3 100755 (executable)
--- a/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh
+++ b/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh
@@ -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)
 #
 #