summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-10-14 18:23:44 +0200
committerVijay Bellur <vbellur@redhat.com>2014-10-20 23:36:41 -0700
commit49d6a7b17f7cffbb9a33b61c9751b37353b8bd08 (patch)
treea249211311e14e305eb07f391395d040bf1f00b7
parenteea806646216f5e5a91fd35a4e138e193e3b6fac (diff)
Regression test portability: quota.t
- Use du -k to have size reported in kB, as NetBSD defaults to blocks - on overquota, Linux says 'No space left' and NetBSD 'Disc quota exceeded' BUG: 1129939 Change-Id: I6a2baef94cb60e9fabf06a6f8d01f2acb6ee0a30 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/8930 Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rwxr-xr-xtests/basic/quota.t4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
index d5a95e2181d..89489b3951b 100755
--- a/tests/basic/quota.t
+++ b/tests/basic/quota.t
@@ -162,13 +162,13 @@ done
## --------------------------------
for i in `seq 1 200`; do
dd if=/dev/urandom of="$M0/$TESTDIR/dir1/1MBfile$i" bs=1024k count=1 \
- 2>&1 | grep -v "No space left"
+ 2>&1 | egrep -v '(No space left|Disc quota exceeded)'
done
# 65
## <Test whether quota limit crossed more than 10% of limit>
## ---------------------------------------------------------
-USED_KB=`du -s $M0/$TESTDIR/dir1 | cut -f1`;
+USED_KB=`du -ks $M0/$TESTDIR/dir1 | cut -f1`;
USED_MB=$(($USED_KB/1024));
TEST [ $USED_MB -le $((($QUOTALIMIT * 110) / 100)) ]