Add new more stringent maxvol2 test

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 831e232728210b1ba06713a605e945637b1dfb83..d25c3b5d3a40f06d384be2281d6b93e98781f4a0 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -38,6 +38,7 @@ nice tests/restore-disk-seek-test
 nice tests/six-vol-test
 nice tests/span-vol-test
 nice tests/maxvol-test
+nice tests/maxvol2-test
 nice tests/sparse-compressed-test
 nice tests/sparse-test
 nice tests/two-jobs-test

diff --git a/regress/tests/maxvol2-test b/regress/tests/maxvol2-test
new file mode 100755 (executable)
index 0000000..f99b160
--- /dev/null
+++ b/regress/tests/maxvol2-test
@@ -0,0 +1,92 @@
+#!/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. Tests maxvoljobs and volretention.
+#
+TestName="maxvol2-test"
+JobName=Maxvol2
+. scripts/functions
+
+scripts/cleanup
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
+
+change_jobname NightlySave $JobName
+start_test
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@output /dev/null
+messages
+@$out ${cwd}/tmp/log1.out
+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
+setdebug level=50 storage=File1
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+wait
+messages
+list volumes
+@sleep 10
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+wait
+messages
+list volumes
+@sleep 10
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+wait
+messages
+list volumes
+@sleep 10
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+wait
+messages
+list volumes
+@sleep 10
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+wait
+messages
+list volumes
+@sleep 10
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+wait
+messages
+list volumes
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=File1
+unmark *
+mark *
+done
+yes
+wait
+messages
+@output
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=File1
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index a42151517fdbd4b48bdcfa178ddc50c6f92a4f11..8bf68d612e2fef8eef00e9515dbcf75563a8f697 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -24,33 +24,42 @@ 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=TestVolume001 maxvolbytes=200000000
 update Volume=TestVolume002 volretention=10s
-update Volume=TestVolume002 maxvoljobs=1
+update Volume=TestVolume002 maxvolbytes=200000000
 update Volume=TestVolume003 volretention=10s
-update Volume=TestVolume003 maxvoljobs=1
+update Volume=TestVolume003 maxvolbytes=200000000
 list volumes
+@#setdebug level=100 storage=File1
+run job=$JobName storage=File1 level=full yes
 run job=$JobName storage=File1 level=full yes
-wait
-messages
-list volumes
 run job=$JobName storage=File1 level=full yes
 wait
 messages
 list volumes
 run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
 wait
 messages
 list volumes
 @sleep 10
 run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
 wait
 messages
 list volumes
+@sleep 10
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
 run job=$JobName storage=File1 level=full yes
 wait
 messages
 list volumes
+@sleep 10
+run job=$JobName storage=File1 level=full yes
+run job=$JobName storage=File1 level=full yes
 run job=$JobName storage=File1 level=full yes
 wait
 messages