2 files changed, 28 insertions, 1 deletions
diff --git a/tests/bugs/quota/bug-1292020.t b/tests/bugs/quota/bug-1292020.t
new file mode 100644
index 00000000000..14b311c9d76
--- /dev/null
+++ b/tests/bugs/quota/bug-1292020.t
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+function write_sample_data () {
+        dd if=/dev/zero of=$M0/f1 bs=256k count=400 2>&1 | grep -i exceeded
+}
+
+cleanup;
+
+TEST glusterd;
+TEST pidof glusterd;
+
+TEST $CLI volume create $V0 $H0:$B0/$V0
+TEST $CLI volume start $V0;
+TEST $CLI volume quota $V0 enable;
+TEST $CLI volume quota $V0 limit-usage / 1
+
+TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
+EXPECT "exceeded" write_sample_data
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+cleanup;
diff --git a/tests/bugs/write-behind/bug-1279730.t b/tests/bugs/write-behind/bug-1279730.t
index 38e564b7afc..1c7db1f10d5 100755
--- a/tests/bugs/write-behind/bug-1279730.t
+++ b/tests/bugs/write-behind/bug-1279730.t
@@ -7,7 +7,7 @@
 cleanup;
 
 ## Start and create a volume
-TEST glusterd;
+TEST glusterd
 TEST pidof glusterd;
 TEST $CLI volume info;
 
@@ -15,6 +15,8 @@ TEST $CLI volume create $V0 $H0:$B0/$V0;
 TEST $CLI volume start $V0;
 TEST $CLI volume quota $V0 enable
 TEST $CLI volume quota $V0 limit-usage / 4
+TEST $CLI volume quota $V0 hard-timeout 0
+TEST $CLI volume quota $V0 soft-timeout 0
 
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0