summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2015-12-10 12:33:05 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2015-12-10 20:37:56 -0800
commitfc07e9c90db11bbbadf341d0720a874a8cd1fdc5 (patch)
treea1108742cc03934e90236a6d49f93bdd2374aef9
parent02168fdd1b0d63bac758db2f5e4a53b28e459f97 (diff)
tests: Fix arbiter-statfs.t
..and remove it from bad tests list. 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: I933611c41f93ac646f1170b62db656314c801ef1 BUG: 1290125 Signed-off-by: Ravishankar N <ravishankar@redhat.com> Reviewed-on: http://review.gluster.org/12936 Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
-rwxr-xr-xrun-tests.sh1
-rw-r--r--tests/basic/afr/arbiter-statfs.t10
2 files changed, 7 insertions, 4 deletions
diff --git a/run-tests.sh b/run-tests.sh
index e6d9cee..e21f165 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -211,7 +211,6 @@ function is_bad_test ()
./tests/basic/afr/sparse-file-self-heal.t \
./tests/basic/afr/replace-brick-self-heal.t \
./tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t \
- ./tests/basic/afr/arbiter-statfs.t \
./tests/features/weighted-rebalance.t \
; do
[ x"$name" = x"$bt" ] && return 0 # bash: zero means true/success
diff --git a/tests/basic/afr/arbiter-statfs.t b/tests/basic/afr/arbiter-statfs.t
index 9210080..7d13637 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