Final changes

[bacula/bacula] / regress / tests / restore2-by-file-test

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 5e419e746dc43720a79a96eea101fadad53f924e..cfbf2cbc83243bbffd07de0845b4478fcfa3236b 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -8,18 +8,15 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
-bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 echo " "
 echo " "
-echo " === Starting restore2-by-file-test ==="
-echo " === Starting restore2-by-file-test ===" >>working/log
+echo " === Starting restore2-by-file-test at `date +%R:%S` ==="
+echo " === Starting restore2-by-file-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.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
@@ -31,20 +28,18 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-7
-<${cwd}/tmp/restore2-list
-
+restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore2-list
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 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=$?
 dstat=0
 for i in `cat ${cwd}/tmp/restore2-list`; do