Update a couple of tests

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

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 006707adf68d419b6f83a20f183ce2700a5fd910..27e71505a6b8a28822726916d5148b4e6316547a 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -28,10 +28,7 @@ label storage=File1
 TestVolume001
 label storage=File1
 TestVolume002
-update Volume=TestVolume001
-6
-3000000
-10
+update Volume=TestVolume001 MaxVolBytes=3000000
 run job=NightlySave storage=File1
 yes
 wait

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index c366cfed5d9b85cfdf3801aa4a7d12185d39257f..dab543e4615d66c277c659fd046ce9f282ea2f79 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -3,7 +3,8 @@
 # Run a simple backup of the Bacula build directory but 
 #   split the archive into two volumes, then restore
 #   files on only one of the volumes and ensure that
-#   the other volume is not used.
+#   the other volume is not used.  I.e. bsr optimization
+#   works.
 #
 cwd=`pwd`
 scripts/copy-test-confs

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 30446930854dfa89d351071839ccbeaff07ec300..239de70cc5faff867f43f3a330453b878cebfe77 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -3,7 +3,7 @@
 # Run a simple backup of the Bacula build directory but 
 #   create three volumes and do six backups causing the
 #   volumes to be recycled, and cycling through the volumes
-#   twice.
+#   twice. Tests maxvoljobs and volretention.
 #
 cwd=`pwd`
 scripts/copy-test-confs
@@ -19,8 +19,7 @@ echo " === Starting recycle-test  ==="
 echo " === Starting recycle-test  ===" >working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index d017fbb16ccf30ae895f25b8c8ea03df93b1ce54..de1c30a2655fc82e14ed8cc677730ae73254bba7 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -2,7 +2,8 @@
 #
 # Run a simple backup of the Bacula build directory but 
 #   split the archive into four volumes, two of which are
-#   totally full. 
+#   totally full. I.e. make sure that bsr selects all tapes 
+#   including those fully spanned.
 #
 cwd=`pwd`
 scripts/copy-test-confs