Fix 2 tape tests

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

diff --git a/regress/scripts/bacula-dir-win32-tape.conf b/regress/scripts/bacula-dir-win32-tape.conf
index 84898c71900135d35a166d87becf132a38ff7ba3..a54de6b4b2157bf575fbc8942831f226ea0fef79 100644 (file)
--- a/regress/scripts/bacula-dir-win32-tape.conf
+++ b/regress/scripts/bacula-dir-win32-tape.conf
@@ -13,7 +13,7 @@
 #
 
 Director {                            # define myself
-  Name = roxie-dir
+  Name = rufus-dir
   DIRport = 8101                # where we listen for UA connections
   QueryFile = "/home/kern/bacula/regress/bin/query.sql"
   WorkingDirectory = "/home/kern/bacula/regress/working"

diff --git a/regress/scripts/bacula-sd-2tape.conf.in b/regress/scripts/bacula-sd-2tape.conf.in
index 3e9f83a595079979ca17ec4af5411fe53b24be4f..84e4c911a64ae5a91d704423473a8917635cafdf 100644 (file)
--- a/regress/scripts/bacula-sd-2tape.conf.in
+++ b/regress/scripts/bacula-sd-2tape.conf.in
@@ -34,7 +34,7 @@ Director {
 Autochanger {
   Name = DDS-4
   Changer Device = @autochanger@
-  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a"
+  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a %d"
   Device = Drive-0
 }
 

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index f87c0f448a3bec49c83ad5432b85077185173f5b..a9bedc5a74ec8ede9135e249aff06b1ee87d0f8f 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -5,6 +5,12 @@
 #  Note, this test simulates the tape filling and writing to
 #   the next tape.
 #
+debug=0
+if test "$debug" -eq 1 ; then
+  out="tee"
+else
+  out="output"
+fi
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2tape-confs
@@ -12,39 +18,46 @@ scripts/prepare-two-tapes
  
 echo "${cwd}/build" >/tmp/file-list
 
-out="tmp/sed_tmp"
-echo "s%# Maximum File Size%  Maximum File Size%g" >${out}
+outf="tmp/sed_tmp"
+echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
 echo " "
 echo " "
 echo " === Starting Two Volume Tape test at `date +%R:%S` ==="
 echo " === Starting Two Volume Tape test at `date +%R:%S` ===" >>working/log
 echo " "
-
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
-@output /dev/null
+# Write out bconsole commands
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default
 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default
-update Volume=TestVolume001 MaxVolBytes=3000000
+update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default
 run job=NightlySave yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages
-@output
+@$out
 quit
 END_OF_DATA
+
+if test "$debug" -eq 1 ; then
+  bin/bacula start
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+fi
 scripts/check_for_zombie_jobs storage=DDS-4
 
 bin/bacula stop 2>&1 >/dev/null