From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 27 Oct 2008 18:34:58 +0000 (+0000)
Subject: ebl  Fix tmp/log1.out bug
X-Git-Tag: Release-7.0.0~3841
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bf3db76fc316d720bcb87ce78a6a7a5dcc86c781;p=bacula%2Fbacula

ebl  Fix tmp/log1.out bug


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7915 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/tests/next-vol-test b/regress/tests/next-vol-test
index 77298386d1..4818098425 100755
--- a/regress/tests/next-vol-test
+++ b/regress/tests/next-vol-test
@@ -127,18 +127,18 @@ run_bconsole
 
 awk '/Must choose/ { print $4 } '    tmp/log2.out > tmp/normal
 awk '/Volume name.+:/ { print $3 } ' tmp/log2.out > tmp/real
-if test "$debug" -eq 1; then
+if [ "$debug" -eq 1 ]; then
    diff -ur tmp/normal tmp/real
 else
    diff tmp/normal tmp/real > /dev/null
 fi
-export dstat=$?
+
+dstat=$?
 
 # try to break the old code 
 # in this situation, we have 1 available volume (vol50) and bacula will try to use
 # vol47, vol48 and vol49 and will stop without using vol50.
 
-
 cat <<EOF > ${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
 update volume=vol47 pool=Test VolStatus=Used VolRetention=10s inchanger=no RecyclePool=Test
@@ -155,16 +155,15 @@ messages
 quit
 EOF
 
-#run_bconsole
-
-check_for_zombie_jobs storage=LTO3
-stop_bacula
-
+run_bconsole
 grep "Invalid slot=0 defined in catalog for Volume" tmp/log1.out > /dev/null
 if [ $? -ne 0 ]; then
    bstat=$?
 fi
 
+check_for_zombie_jobs storage=LTO3
+stop_bacula
+
 check_two_logs
 
 end_test