From 60912c650839a512e5b2f4a251100969f830996d Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Fri, 11 Dec 2015 10:32:52 +0530 Subject: Fix arbiter-statfs.t ..and remove it from bad tests list. Backport of http://review.gluster.org/#/c/12936/ Problem: https://build.gluster.org/job/rackspace-netbsd7-regression-triggered/12516/consoleFull ++ SETUP_LOOP /d/backends/brick1 ++ '[' 1 '!=' 1 ']' ++ backend=/d/backends/brick1 ++ case ${OSTYPE} in +++ awk -F: '/not in use/{print $1; exit}' +++ vnconfig -l vnconfig: VNDIOCGET: Bad file descriptor ++ vnd= ++ '[' x = x ']' ++ echo 'no more vnd' no more vnd ++ return 1 Fix: TEST the return value of SETUP_LOOP. Also added EXIT_EARLY to the test case because there is no point in continuing the test when setting the bricks fail. Change-Id: Idca269650385765a13be070186dc0b7eb2e5fda1 BUG: 1290658 Signed-off-by: Ravishankar N Reviewed-on: http://review.gluster.org/12947 Reviewed-by: Michael Adam Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Pranith Kumar Karampuri --- tests/basic/afr/arbiter-statfs.t | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/basic/afr') diff --git a/tests/basic/afr/arbiter-statfs.t b/tests/basic/afr/arbiter-statfs.t index 9210080c16c..7d136378f11 100644 --- a/tests/basic/afr/arbiter-statfs.t +++ b/tests/basic/afr/arbiter-statfs.t @@ -5,6 +5,7 @@ . $(dirname $0)/../../volume.rc cleanup; +EXIT_EARLY=1 TEST glusterd #Create brick partitions @@ -12,11 +13,14 @@ TEST truncate -s 1G $B0/brick1 TEST truncate -s 1G $B0/brick2 #Arbiter brick is of a lesser size. TEST truncate -s 90M $B0/brick3 -TEST LO1=`SETUP_LOOP $B0/brick1` +LO1=`SETUP_LOOP $B0/brick1` +TEST [ $? -eq 0 ] TEST MKFS_LOOP $LO1 -TEST LO2=`SETUP_LOOP $B0/brick2` +LO2=`SETUP_LOOP $B0/brick2` +TEST [ $? -eq 0 ] TEST MKFS_LOOP $LO2 -TEST LO3=`SETUP_LOOP $B0/brick3` +LO3=`SETUP_LOOP $B0/brick3` +TEST [ $? -eq 0 ] TEST MKFS_LOOP $LO3 TEST mkdir -p $B0/${V0}1 $B0/${V0}2 $B0/${V0}3 TEST MOUNT_LOOP $LO1 $B0/${V0}1 -- cgit