X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbackup-bacula-test;h=a21bca9749d7df17bb3fc93310bbfd0aa6b80ad6;hb=dc4fc7501809d6b8622fd66b8dec4d5cce2283f3;hp=d61a8688ac0007d6d630b5eccdb7f996d0f1daf1;hpb=45dc0d2f1f568fcc62526533adacde65df441837;p=bacula%2Fbacula

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index d61a8688ac..a21bca9749 100755
--- 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 >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >$tmp/bconcmds
+@$out /dev/null
 messages
-@$out 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 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 >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >$tmp/bconcmds
+@$out /dev/null
 messages
-@$out 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 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