X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-tape;h=4b827d7eb70f9a147f63ab4c81f84e39e0f7fb01;hb=7f2d4342af6f630a86e12a6ca63b2a497fdf5a1e;hp=43eb3f40524008e6c10131df0e7d92c66cb8dcda;hpb=a8b9586bf314ed146b28a924b96023e8d6b1f837;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 43eb3f4052..4b827d7eb7 100755
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -4,9 +4,6 @@
 #   new files, do an Incremental and restore those two files.
 #
 cwd=`pwd`
-bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 scripts/copy-tape-confs
 scripts/cleanup-tape
@@ -22,24 +19,25 @@ cd ${cwd}
 
 echo " "
 echo " "
-echo " === Starting incremental-tape test ==="
-echo " === Starting incremental-tape test ===" >>working/log
+echo " === Starting incremental-tape test at `date +%R:%S` ==="
+echo " === Starting incremental-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
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-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/log1.out
@@ -50,7 +48,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores 
+restore where=${cwd}/tmp/bacula-restores storage=DDS-4
 7
 <${cwd}/tmp/restore-list
 
@@ -60,10 +58,11 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 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=$?
 #
 # Delete .c files because we will only restored the txt files