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 bf329d125a263c48007e4a5ce5e05980a8b72eb3..a21bca9749d7df17bb3fc93310bbfd0aa6b80ad6 100755 (executable)
--- 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/copy-confs
 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
-label volume=TestVolume001
-@#setdebug level=100 storage=File
+@$out $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,17 +52,46 @@ 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
 
 run_bacula
-check_for_zombie_jobs storate=File
+check_for_zombie_jobs storage=File
+stop_bacula
+
+cat <<END_OF_DATA >$tmp/bconcmds
+@$out /dev/null
+messages
+@$out $tmp/log1.out
+@#setdebug level=100 storage=File
+run job=$JobName yes
+wait
+messages
+@# 
+@# now do a restore
+@#
+@$out $tmp/log2.out  
+restore where=$tmp/bacula-restores select all done
+yes
+wait
+messages
+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