Merge branch 'master' into basejobv3

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

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 0815c38316630e96ac76638ddf4c295e2928a681..a21bca9749d7df17bb3fc93310bbfd0aa6b80ad6 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -10,15 +10,24 @@ JobName=backup
 scripts/cleanup
 scripts/copy-confs
 
-change_jobname Client1 $JobName
+#
+# Zap out any schedule in default conf file so that
+#  it doesn't start during our test
+#
+outf="$tmp/sed_tmp"
+echo "s%  Schedule =%# Schedule =%g" >${outf}
+cp $scripts/bacula-dir.conf $tmp/1
+sed -f ${outf} $tmp/1 >$scripts/bacula-dir.conf
+
+change_jobname BackupClient1 $JobName
 start_test
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >$tmp/bconcmds
+@$out /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out $tmp/log1.out
+setdebug level=100 storage=File
 label volume=TestVolume001 storage=File pool=Default
-@#setdebug level=100 storage=File
 run job=$JobName yes
 status storage=File
 status storage=File
@@ -43,12 +52,11 @@ messages
 @# 
 @# now do a restore
 @#
-@$out ${cwd}/tmp/log2.out  
-restore where=${cwd}/tmp/bacula-restores select all done
+@$out $tmp/log2.out  
+restore where=$tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -56,10 +64,10 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >$tmp/bconcmds
+@$out /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out $tmp/log1.out
 @#setdebug level=100 storage=File
 run job=$JobName yes
 wait
@@ -67,12 +75,11 @@ messages
 @# 
 @# now do a restore
 @#
-@$out ${cwd}/tmp/log2.out  
-restore where=${cwd}/tmp/bacula-restores select all done
+@$out $tmp/log2.out  
+restore where=$tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA