Add new recycle test

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 69d5c68c32685a7975c7e85e2bf9b33d0cbe6df5..1d89005b7095c249f81385e3644e26505914da8d 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -17,6 +17,8 @@ tests/wierd-files2-test
 tests/concurrent-jobs-test
 tests/concurrent2-jobs-test
 tests/bsr-opt-test
+tests/bextract-test
+tests/recycle-test
 echo " "
 echo " "
 echo "Test results"

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
new file mode 100755 (executable)
index 0000000..3044693
--- /dev/null
+++ b/regress/tests/recycle-test
@@ -0,0 +1,90 @@
+#!/bin/sh
+#
+# 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.
+#
+cwd=`pwd`
+scripts/copy-test-confs
+scripts/cleanup
+echo "${cwd}/build" >/tmp/file-list
+bin/bacula stop 2>&1 >/dev/null
+bin/drop_sqlite_tables
+bin/make_sqlite_tables
+
+echo " "
+echo " "
+echo " === Starting recycle-test  ==="
+echo " === Starting recycle-test  ===" >working/log
+echo " "
+
+#bin/bacula start 2>&1 >/dev/null
+bin/bacula start
+bin/console -c bin/console.conf <<END_OF_DATA
+@output /dev/null
+messages
+label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume002
+label storage=File1 volume=TestVolume003
+update Volume=TestVolume001 volretention=10s
+update Volume=TestVolume001 maxvoljobs=1
+update Volume=TestVolume002 volretention=10s
+update Volume=TestVolume002 maxvoljobs=1
+update Volume=TestVolume003 volretention=10s
+update Volume=TestVolume003 maxvoljobs=1
+list volumes
+run job=NightlySave storage=File1 level=full yes
+wait
+messages
+list volumes
+run job=NightlySave storage=File1 level=full yes
+wait
+messages
+list volumes
+run job=NightlySave storage=File1 level=full yes
+wait
+messages
+list volumes
+@sleep 10
+run job=NightlySave storage=File1 level=full yes
+wait
+messages
+list volumes
+run job=NightlySave storage=File1 level=full yes
+wait
+messages
+@output tmp/log1.out
+list volumes
+run job=NightlySave storage=File1 level=full yes
+wait
+messages
+list volumes
+@# 
+@# now do a restore
+@#
+@output tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores current all
+yes
+wait
+messages
+@output
+quit
+END_OF_DATA
+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 -r build  tmp/bacula-restores${cwd}/build
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
+   echo " "
+   echo " "
+   echo "  !!!!! recycle-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! recycle-test failed!!! !!!!! " >>test.out
+   echo " "
+else
+   echo "  ===== recycle-test Bacula source OK ===== "
+   echo "  ===== recycle-test OK ===== " >>test.out
+   scripts/cleanup
+fi

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index d4795a5057c8abc973a482ea9e2c5806039ecffe..a7d64e9fa019ba1ffd21580ecb6a1341201a203a 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -21,17 +21,14 @@ bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-@output tmp/log1.out
-label storage=File1
-TestVolume001
-label storage=File1
-TestVolume002
+@tee    tmp/log1.out
+label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume002
 update Volume=TestVolume001
 6
 3000000
 10
-run job=NightlySave storage=File1
-yes
+run job=NightlySave storage=File1 yes
 wait
 messages
 @#