summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs/bug-1100050.t25
-rw-r--r--tests/include.rc1
-rw-r--r--tests/volume.rc4
3 files changed, 30 insertions, 0 deletions
diff --git a/tests/bugs/bug-1100050.t b/tests/bugs/bug-1100050.t
new file mode 100644
index 00000000000..537591dcd82
--- /dev/null
+++ b/tests/bugs/bug-1100050.t
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+
+cleanup;
+
+TEST glusterd;
+TEST pidof glusterd;
+
+TEST gluster volume create $V0 stripe 2 $H0:$B0/{1,2} force;
+TEST gluster volume start $V0;
+TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
+
+TEST gluster volume quota $V0 enable;
+
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" quotad_up_status;
+
+TEST mkdir $M0/dir;
+
+TEST gluster volume quota $V0 limit-usage /dir 10MB;
+
+TEST mkdir $M0/dir/subdir;
+
+cleanup;
diff --git a/tests/include.rc b/tests/include.rc
index 3017de9e653..41c4f332982 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -10,6 +10,7 @@ statedumpdir=`gluster --print-statedumpdir`; # Default directory for statedump
CHILD_UP_TIMEOUT=60
CLI="gluster --mode=script";
+PROCESS_UP_TIMEOUT=20
mkdir -p $B0;
mkdir -p $M0 $M1;
mkdir -p $N0 $N1;
diff --git a/tests/volume.rc b/tests/volume.rc
index 2ddb7fc502d..e3346bc8004 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -146,6 +146,10 @@ function glustershd_up_status {
gluster volume status | grep "Self-heal Daemon" | awk '{print $6}'
}
+function quotad_up_status {
+ gluster volume status | grep "Quota Daemon" | awk '{print $6}'
+}
+
function get_brick_pid {
local vol=$1
local host=$2