X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frecycle-test;h=701a0083e78fd0f5b7fad47cba4d2c7ac07981e9;hb=70f4723a1094c8c55d7a501ff52c1ff51a3542bf;hp=8bf68d612e2fef8eef00e9515dbcf75563a8f697;hpb=7ec6a7e8c7b6908e321883b18dbc64e244bc282a;p=bacula%2Fbacula

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 8bf68d612e..701a0083e7 100755
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -5,6 +5,11 @@
 #   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
@@ -23,41 +28,49 @@ messages
 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 maxvolbytes=200000000
 update Volume=TestVolume002 volretention=10s
 update Volume=TestVolume002 maxvolbytes=200000000
 update Volume=TestVolume003 volretention=10s
 update Volume=TestVolume003 maxvolbytes=200000000
+update Volume=TestVolume004 volretention=10s
+update Volume=TestVolume004 maxvolbytes=200000000
 list volumes
-@#setdebug level=100 storage=File1
+setdebug level=150 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 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 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 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