ebl update MaxWaitTime test

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

diff --git a/regress/scripts/bacula-dir.conf.maxtime.in b/regress/scripts/bacula-dir.conf.maxtime.in
index 5223327c76a6a17b7ae1e8ce0ac7ac16e0daeb20..e541a931f436595c8dc1de28a8c3fed6c150562e 100644 (file)
--- a/regress/scripts/bacula-dir.conf.maxtime.in
+++ b/regress/scripts/bacula-dir.conf.maxtime.in
@@ -61,7 +61,7 @@ Job {
   Name = "RUN_MAXWAITTIME"
   JobDefs = DefaultJob
   FileSet = FS_TESTJOB
-  MaxWaitTime = 100sec
+  MaxWaitTime = 2min
 }
 
 Job {
@@ -125,6 +125,7 @@ Pool {
   Recycle = yes                       # Bacula can automatically recycle Volumes
   AutoPrune = yes                     # Prune expired volumes
   Volume Retention = 365d             # one year
+  Maximum Volume Bytes = 1M
 }
 
 

diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index 0b1de00cd74a0ba407d14a51409624c2d98ae229..5aa031e8487a1a8ecca235518eac51db97636817 100755 (executable)
--- a/regress/tests/maxtime-test
+++ b/regress/tests/maxtime-test
@@ -10,9 +10,8 @@ JobName=backup
 
 copy_test_confs
 
-rm -f bin/bacula-dir.conf
 rm -f ${cwd}/tmp/RUN*log
-/bin/cp -f scripts/bacula-dir.conf.maxtime bin/bacula-dir.conf
+cp -f ${cwd}/scripts/bacula-dir.conf.maxtime ${cwd}/bin/bacula-dir.conf
 WHEN=`date '+%Y-%m-%d %H:%M:%S'`
 
 echo "${cwd}/build/po" >${cwd}/tmp/file-list
@@ -20,7 +19,7 @@ echo "${cwd}/build/po" >${cwd}/tmp/file-list
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@$out ${cwd}/tmp/log1.out
 messages
 label volume=TestVolume001 pool=PoolA
 @$out ${cwd}/tmp/RUN_MAXTIME.log
@@ -29,6 +28,9 @@ run job=RUN_MAXWAITTIME pool=Default yes
 @sleep 2
 @# storage is used by RUN_MAXWAITTIME => have to wait
 run job=RUN_MAXSTARTDELAY pool=PoolA when="$WHEN" yes
+@sleep 60
+label volume=TestVolume002 pool=Default
+mount
 wait
 messages
 run job=RUN_MAXRUNTIME pool=PoolA yes
@@ -46,12 +48,12 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
-rm ${cwd}/tmp/fifo ${cwd}/tmp/fifo2 ${cwd}/tmp/fifo3
+rm -f ${cwd}/tmp/fifo ${cwd}/tmp/fifo2 ${cwd}/tmp/fifo3
 
-export dstat=0
-export bstat=0
-export rstat=0
-touch ${cwd}/tmp/log1.out
+dstat=0
+bstat=0
+rstat=0
+touch ${cwd}/tmp/log2.out
 
 grep -e '1: Fatal error: Max wait time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null
 if [ $? -eq 0 ]