X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frecycle-test;h=8bf68d612e2fef8eef00e9515dbcf75563a8f697;hb=f1917472243bb52a9471b42f283c4c36d2cb1ec8;hp=244b0df2dac90e4e864d1b67fc242688a5e72d3b;hpb=6a8eafaf4e7f1224125927475704534694ad4cd0;p=bacula%2Fbacula

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 244b0df2da..8bf68d612e 100755
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -8,51 +8,58 @@
 TestName="recycle-test"
 JobName=Recycle
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /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
 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
@@ -60,7 +67,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 *