Update tests

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@809 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index f83fa5b62554d0a837c3db525de792f86874f633..295ebf5a274924935cffcfa2982e23044ca3ae86 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -1,7 +1,8 @@
 #!/bin/sh
 #
 # Run a simple backup of the Bacula build directory 
-#   to a tape then restore it.
+#   to a tape then restore it, we do that twice to ensure that
+#   we can correctly append to a tape.
 #
 cwd=`pwd`
 bin/bacula stop  2>&1 >/dev/null
@@ -34,6 +35,24 @@ restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
 messages
+@#
+@# Now do a second backup
+@#
+@output /dev/null
+messages
+@output tmp/log1.out
+label storage=DDS-4 volume=TestVolume001 slot=0
+run job=NightlySave yes
+wait
+messages
+@# 
+@# now do a second restore
+@#
+@output tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all
+yes
+wait
+messages
 @output
 quit
 END_OF_DATA

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 9e4e69d9691b6ea0f5c13ce198b706dbe07bdb0c..8e1d315076a872966f6d317e114364b19fd7bcda 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -48,14 +48,14 @@ messages
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null
-grep TestVolume001 working/restore.bsr
+grep TestVolume001 working/restore.bsr 2>&1 >/dev/null
 bsrstat=$?
 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 -r build/src/cats  tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null
-if [ $? != 0 -o $bsrstat != 1 -o $bstat != 0 -o $rstat != 0 ] ; then
+if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
    echo "  !!!!! bsr-opt-test Bacula source failed!!! !!!!! "

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 8231cc54afd21942c6127135316c609625e35173..8a0281d8112b0f6babbfd2cd48fbb7bcc7ac7ffc 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -26,11 +26,9 @@ label storage=File1
 TestVolume001
 label storage=File1
 TestVolume002
-update Volume=TestVolume001
-6
-100000000
+update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
-10
+12
 run job=NightlySave level=Full Storage=File1
 yes
 run job=NightlySave level=Full Storage=File1
@@ -49,9 +47,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-5
-done
+restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
 messages