diff options
| author | vmallika <vmallika@redhat.com> | 2015-07-15 15:28:50 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2015-07-16 03:35:56 -0700 |
| commit | 0cd03d6fc98ee103d05fe80887bd471503575723 (patch) | |
| tree | d0829d5cce28befd486e1d7d374edc257e86cde0 /tests/bugs | |
| parent | 09da0f0870dbb79d6e6dfddbfa452152c510d467 (diff) | |
quota: fix quota test case
This is a backport of http://review.gluster.org/#/c/11673/
Below command is wrong way of executing
mutilple command with | (pipe)
local cmd="$CLI volume quota $V0 list $QUOTA_PATH | grep $QUOTA_PATH |
awk '{print \$$FIELD}'"
$cmd
This patch fixes the issue
This patch also fixes testcase inode-quota.t, which checking
quota values in wrongs fields
> Change-Id: If28732e6a76ea4bf75560f6496c8f56670915cf9
> BUG: 1229297
> Signed-off-by: vmallika <vmallika@redhat.com>
Change-Id: I301a62566a97bbb4cc9657e1139772de1f09049a
BUG: 1242329
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11674
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'tests/bugs')
| -rw-r--r-- | tests/bugs/quota/inode-quota.t | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/bugs/quota/inode-quota.t b/tests/bugs/quota/inode-quota.t index cad63e1fd3c..edc2c1de512 100644 --- a/tests/bugs/quota/inode-quota.t +++ b/tests/bugs/quota/inode-quota.t @@ -73,14 +73,14 @@ EXPECT "10" quota_object_list_field "/test_dir" 2 # try creating a 8MB file and it should fail TEST $QDD $M0/test_dir/test1.txt 256 32 -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" quota_list_field "/test_dir" 2 +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "8.0MB" quotausage "/test_dir" TEST rm -f $M0/test_dir/test1.txt -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quota_list_field "/test_dir" 2 +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quotausage "/test_dir" -# try creating a 15MB file and it should succeed +# try creating a 15MB file and it should not succeed TEST ! $QDD $M0/test_dir/test2.txt 256 60 TEST rm -f $M0/test_dir/test2.txt -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quota_list_field "/test_dir" 2 +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quotausage "/test_dir" #------------------------------------------------------ @@ -94,16 +94,16 @@ EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" quota_list_field "/test_dir" 2 for i in {1..9}; do TEST_IN_LOOP touch $M0/test_dir/test$i.txt done -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "10" quota_object_list_field "/test_dir" 4 +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "9" quota_object_list_field "/test_dir" 4 # Check available limit -EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0" quota_object_list_field "/test_dir" 5 +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0" quota_object_list_field "/test_dir" 6 # Check if hard-limit exceeded -EXPECT "Yes" quota_object_list_field "/test_dir" 7 +EXPECT "Yes" quota_object_list_field "/test_dir" 8 # Check if soft-limit exceeded -EXPECT "Yes" quota_object_list_field "/test_dir" 6 +EXPECT "Yes" quota_object_list_field "/test_dir" 7 # Creation of 11th file should throw out an error TEST ! touch $M0/test_dir/test11.txt |