X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbackup-bacula-test;h=d4ab848716fd5676ee0761d34a3edc3f05065b96;hb=25daee7d2a896f1da1f4ac8ffd8b1b57454d1943;hp=7f50f4674c686330d574ce41bd794e2cbae32342;hpb=f06b1130f4780403e32002ec081e5d4f020c591e;p=bacula%2Fbacula

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 7f50f4674c..d4ab848716 100755
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -6,20 +6,28 @@
 TestName="backup-bacula-test"
 JobName=backup
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-confs
 
+#
+# 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 ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
+sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
+
 change_jobname Client1 $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-label volume=TestVolume001
-@#setdebug level=100 storage=File
+@$out ${cwd}/tmp/log1.out
+setdebug level=100 storage=File
+label volume=TestVolume001 storage=File pool=Default
 run job=$JobName yes
 status storage=File
 status storage=File
@@ -44,7 +52,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out  
+@$out ${cwd}/tmp/log2.out  
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -57,6 +65,37 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@output /dev/null
+messages
+@$out ${cwd}/tmp/log1.out
+@#setdebug level=100 storage=File
+run job=$JobName yes
+wait
+messages
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out  
+restore where=${cwd}/tmp/bacula-restores select all done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+#
+# Now do a second backup after making a few changes
+#
+touch ${cwd}/build/src/dird/*.c
+echo "test test" > ${cwd}/build/src/dird/xxx
+#
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
 check_two_logs
 check_restore_diff
 end_test