X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frecycle-test;h=467d959052a42eb4457c7e8c4823f5ff0066a30f;hb=b76f7bc37b0fd454157e383cdf8e31672726dce3;hp=a34126beac34876bdaae688e2b5c93731d260b8c;hpb=0830bb18ada29945abbd1aebaad51c424d7d4593;p=bacula%2Fbacula

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index a34126beac..467d959052 100755
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -5,54 +5,74 @@
 #   volumes to be recycled, and cycling through the volumes
 #   twice. Tests maxvoljobs and volretention.
 #
+# Note, this test is a bit tricky, in that if you get too
+#   much data in the regress/build directory, the test will
+#   fail because it will run out of enough volumes to backup
+#   all the data.
+#
 TestName="recycle-test"
 JobName=Recycle
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
+change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File1 volume=TestVolume001
 label storage=File1 volume=TestVolume002
 label storage=File1 volume=TestVolume003
+label storage=File1 volume=TestVolume004
+@# Note, this is going to fail if the pruning gets
+@#  to tight because the saved volume is too large.
+@#  In that case, either add another volume, or
+@#  increase the volume capacity a bit.
 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
+update Volume=TestVolume004 volretention=10s
+update Volume=TestVolume004 maxvolbytes=200000000
 list volumes
+setdebug level=150 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
+@sleep 11 
+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
+@sleep 11
+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 11
+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 11
+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
@@ -60,7 +80,7 @@ list volumes
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *
@@ -68,7 +88,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA