Final changes

[bacula/bacula] / regress / tests / six-vol-test

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 913069ac8d14c6755270f0028220cfbc0d8aaee7..61e6dff9efd4c4bd41ea20dff63e12f16b6f9bdb 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -4,7 +4,7 @@
 #   each constrained to 10MB using the automatic labeling feature.
 #
 
-if test ! -e /dev/urandom ; then
+if test ! -c /dev/urandom ; then
    echo "No random device. Test skipped.\n"
    exit 0
 fi
@@ -16,9 +16,6 @@ echo "${cwd}/tmp/largefile" >/tmp/file-list
 echo "Creating a 56MB file with random data ..."
 dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
 echo "largefile created"
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 echo " "
 echo " "
@@ -27,36 +24,39 @@ echo " === Starting six-vol-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
-run job=MultiVol storage=File
-yes
+run job=MultiVol storage=File yes
 wait
 messages
 @# 
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-5
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
 done
 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
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile
+diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== six-vol-test Bacula source failed!!! ===== "
-   echo "  ===== six-vol-test failed!!! ===== " >>test.out
+   echo "  !!!!! six-vol-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! six-vol-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== six-vol-test Bacula source OK ===== "