ebl tweak output

[bacula/bacula] / regress / tests / maxtime-test

diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index 39c20081f80d3ff926e1c74de2edc08e82538d76..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
@@ -43,13 +45,15 @@ END_OF_DATA
  mkfifo ${cwd}/tmp/fifo3) 2> /dev/null
 
 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
+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 ]