2 files changed, 56 insertions, 4 deletions
diff --git a/tests/bugs/quota/bug-1235182.t b/tests/bugs/quota/bug-1235182.t
index e28b557f558..2f963e664c6 100644
--- a/tests/bugs/quota/bug-1235182.t
+++ b/tests/bugs/quota/bug-1235182.t
@@ -28,13 +28,22 @@ TEST $CLI volume quota $V0 limit-usage / 1GB
 TEST $CLI volume quota $V0 hard-timeout 0
 TEST $CLI volume quota $V0 soft-timeout 0
 
-$QDD $M0/f1 256 400&
+TEST mkdir $M0/1
+$QDD $M0/1/f1 256 400&
 PID=$!
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $M0/f1
-TESTS_EXPECTED_IN_LOOP=50
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $M0/1/f1
+TESTS_EXPECTED_IN_LOOP=150
 for i in {1..50}; do
         ii=`expr $i + 1`;
-        TEST_IN_LOOP mv $M0/f$i $M0/f$ii;
+        touch $M0/$i/f$ii
+        echo Hello > $M0/$i/f$ii
+
+        #rename within same dir
+        TEST_IN_LOOP mv -f $M0/$i/f$i $M0/$i/f$ii;
+
+        #rename to different dir
+        TEST_IN_LOOP mkdir $M0/$ii
+        TEST_IN_LOOP mv -f $M0/$i/f$ii $M0/$ii/f$ii;
 done
 
 echo "Wait for process with pid $PID to complete"
diff --git a/tests/bugs/quota/bug-1240991.t b/tests/bugs/quota/bug-1240991.t
new file mode 100644
index 00000000000..2a1a6d1868e
--- /dev/null
+++ b/tests/bugs/quota/bug-1240991.t
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# This regression test tries to ensure renaming a directory with content, and
+# no limit set, is accounted properly, when moved into a directory with quota
+# limit set.
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd
+TEST pidof glusterd;
+TEST $CLI volume info;
+
+TEST $CLI volume create $V0 $H0:$B0/${V0}
+TEST $CLI volume start $V0;
+
+TEST $CLI volume quota $V0 enable;
+
+TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0;
+
+TEST $CLI volume quota $V0 hard-timeout 0
+TEST $CLI volume quota $V0 soft-timeout 0
+
+TEST mkdir -p $M0/dir/dir1
+TEST $CLI volume quota $V0 limit-objects /dir 20
+
+TEST mkdir $M0/dir/dir1/d{1..5}
+TEST touch $M0/dir/dir1/f{1..5}
+TEST mv $M0/dir/dir1 $M0/dir/dir2
+
+#Number of files under /dir is 5
+EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "5" quota_object_list_field "/dir" 4
+
+#Number of directories under /dir is 7
+EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "7" quota_object_list_field "/dir" 5
+
+TEST $CLI volume stop $V0
+TEST $CLI volume delete $V0
+EXPECT "1" get_aux
+
+cleanup;