summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-01-10 05:49:42 +0100
committerVijay Bellur <vbellur@redhat.com>2015-01-10 00:00:25 -0800
commit12022fc87ee6b12c07bff0381701e2977e722382 (patch)
tree7ca735936ce56b5bc587afeb6393b69f4f64c905
parent548547b2e41c8e2cf79b929405cf18aecbdedebc (diff)
Spare spurious regression in quota.t
Like quota-nfs.t, quota.t shows spurious regressions because dd writes too fast. Reuse the C program used by quota-nfs.t to write slowly, and rename it to show it is not specific to quota-nfs.t BUG: 1129939 Change-Id: I14b50e368023e88dc8bcc76c266cc908d62f89e2 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/9410 Reviewed-by: Vijay Bellur <vbellur@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rwxr-xr-xtests/basic/quota-nfs.t4
-rw-r--r--tests/basic/quota.c (renamed from tests/basic/quota-nfs.c)0
-rwxr-xr-xtests/basic/quota.t5
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/basic/quota-nfs.t b/tests/basic/quota-nfs.t
index 501d8ab6381..ea1fce93a3e 100755
--- a/tests/basic/quota-nfs.t
+++ b/tests/basic/quota-nfs.t
@@ -41,9 +41,9 @@ TEST dd if=/dev/zero of=$N0/$deep/newfile_1 bs=512 count=10240
EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" usage "/"
# compile the test write program and run it
-TEST $CC $(dirname $0)/quota-nfs.c -o $(dirname $0)/quota-nfs;
+TEST $CC $(dirname $0)/quota.c -o $(dirname $0)/quota;
# Try to create a 100Mb file which should fail
-TEST ! $(dirname $0)/quota-nfs $N0/$deep/newfile_2 "104857600"
+TEST ! $(dirname $0)/quota $N0/$deep/newfile_2 "104857600"
TEST rm -f $N0/$deep/newfile_2
## Before killing daemon to avoid deadlocks
diff --git a/tests/basic/quota-nfs.c b/tests/basic/quota.c
index 4cc0322e132..4cc0322e132 100644
--- a/tests/basic/quota-nfs.c
+++ b/tests/basic/quota.c
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
index f4bcfdc0267..25a5fbfd4a3 100755
--- a/tests/basic/quota.t
+++ b/tests/basic/quota.t
@@ -72,7 +72,10 @@ TEST $CLI volume quota $V0 hard-timeout 0
## Verify quota enforcement
## -----------------------------
-TEST ! dd if=/dev/urandom of=$M0/test_dir/1.txt bs=1024k count=12
+# compile the test write program and run it
+TEST $CC $(dirname $0)/quota.c -o $(dirname $0)/quota;
+# Try to create a 12MB file which should fail
+TEST ! $(dirname $0)/quota $M0/test_dir/1.txt "12582912"
TEST rm $M0/test_dir/1.txt
# wait for marker's accounting to complete