From c2e4990a204aeaec3105f97bdfa7b48a571fa1fa Mon Sep 17 00:00:00 2001 From: Kevin Vigor Date: Fri, 6 Jan 2017 13:19:35 -0800 Subject: tests: Fix prove test bug-1292020.t dd is doing a statfs and failing with ENOSPC instead of writign and getting EDQUOTA. Make either error a success in this test. > Signed-off-by: Kevin Vigor > Reviewed-on: http://review.gluster.org/16352 BUG: 1521116 Signed-off-by: ShyamsundarR Change-Id: I9f580d9e4a4dd293df55a1d954f86a9862fcae7b --- tests/bugs/quota/bug-1292020.t | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/bugs/quota/bug-1292020.t b/tests/bugs/quota/bug-1292020.t index 05c22776987..b70047ae3f9 100644 --- a/tests/bugs/quota/bug-1292020.t +++ b/tests/bugs/quota/bug-1292020.t @@ -4,14 +4,10 @@ . $(dirname $0)/../../volume.rc function write_sample_data () { - dd if=/dev/zero of=$M0/f1 bs=256k count=400 2>&1 | grep -i exceeded + dd if=/dev/zero of=$M0/f1 bs=256k count=400 2>&1 | + egrep -i 'exceeded|no space' && echo 'passed' } -# Remove below block once we fix the actual hang -echo "TODO: Validate and fix the hang issue soon"; -SKIP_TESTS -exit 0 - cleanup; TEST glusterd; @@ -24,8 +20,8 @@ TEST $CLI volume quota $V0 limit-usage / 1 TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0; -# Needed one extra lookup sometimes on this -EXPECT_WITHIN 30 "exceeded" write_sample_data + +EXPECT_WITHIN 30 "passed" write_sample_data TEST $CLI volume stop $V0 TEST $CLI volume delete $V0 -- cgit