X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbackup-bacula-test;h=d8512e2181c5c49dc251560c18bd5cb012629030;hb=e1d2438958fff71fe6d2e64398733825ef520ce7;hp=d2efe39db8c851b6cd2c26a1e8b510809a6d099f;hpb=f0487f1f3bb90555a6a11036e552e40a631c4ca1;p=bacula%2Fbacula

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index d2efe39db8..d8512e2181 100755
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -6,9 +6,6 @@
 cwd=`pwd`
 scripts/copy-confs
 scripts/cleanup
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 echo " "
 echo " "
@@ -17,41 +14,62 @@ echo " === Starting Backup Bacula Test ===" >>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
 @output /dev/null
 messages
 @output tmp/log1.out
-label
-TestVolume001
-run job=Client1
-yes
+label volume=TestVolume001
+run job=Client1 yes
+status storage=File
+status storage=File
+status storage=File
+status storage=File
+status storage=File
+status storage=File
+sleep 1
+status storage=File
+status storage=File
+status storage=File
+status storage=File
+status storage=File
+sleep 1
+status storage=File
+status storage=File
+status storage=File
+status storage=File
+status storage=File
 wait
 messages
 @# 
 @# now do a restore
 @#
 @output tmp/log2.out  
-restore
-5
-done
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
-@sleep 1
 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=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== Backup Bacula Test failed!!! ===== "
-   echo "  ===== Backup Bacula Test failed!!! ===== " >>test.out
+   echo "  !!!!! Backup Bacula Test failed!!! !!!!! "
+   echo "  !!!!! Backup Bacula Test failed!!! !!!!! " >>test.out
+   if [ $bstat != 0 -o $rstat != 0 ] ; then
+      echo "  !!!!! Bad Job termination status     !!!!! "
+      echo "  !!!!! Bad Job termination status     !!!!! " >>test.out
+   else
+      echo "  !!!!! Restored files differ          !!!!! "
+      echo "  !!!!! Restored files differ          !!!!! " >>test.out
+   fi
    echo " "
 else
    echo "  ===== Backup Bacula Test OK ===== "