Update tape tests for pool

[bacula/bacula] / regress / tests / bscan-tape

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index 0709a1c3403841e1865f40c8e0cd37f1ca6304ea..07c4aea41946a76fc8b97e5d34bab6a6dc72d992 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -15,8 +15,8 @@ sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula
 
 echo " "
 echo " "
-echo " === Starting bscan-tape  ==="
-echo " === Starting bscan-tape  ===" >>working/log
+echo " === Starting bscan-tape at `date +%R:%S` ==="
+echo " === Starting bscan-tape at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
@@ -27,7 +27,8 @@ estimate job=NightlySave listing
 estimate job=NightlySave listing
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+setdebug level=2 storage=DDS-4
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 wait
 run job=NightlySave level=Full yes
@@ -62,7 +63,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -79,7 +80,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -103,7 +104,7 @@ bin/bacula stop 2>&1 >/dev/null
 echo "volume=TestVolume001" >tmp/bscan.bsr
 bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log2.out
@@ -120,9 +121,9 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
 rm -f  ${cwd}/build/src/lib/dummy
 bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then