From: Kern Sibbald Date: Tue, 17 Jun 2003 11:26:37 +0000 (+0000) Subject: Cleanup + add concurrent jobs test X-Git-Tag: Release-1.31~69 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f0487f1f3bb90555a6a11036e552e40a631c4ca1;p=bacula%2Fbacula Cleanup + add concurrent jobs test git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@587 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests index de3aebc524..fd3ad15ef3 100755 --- a/regress/all-non-root-tests +++ b/regress/all-non-root-tests @@ -14,6 +14,7 @@ tests/two-vol-test tests/six-vol-test tests/bscan-test tests/wierd-files2-test +tests/concurrent-jobs-test echo " " echo " " echo "Test results" diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup index e2257b217f..8658fb9fd9 100755 --- a/regress/scripts/cleanup +++ b/regress/scripts/cleanup @@ -4,4 +4,4 @@ # rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small* rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume* -rm -rf tmp/restored tmp/largefile tmp/bscan.bsr +rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in index 94bd6f1b36..d210e966d4 100644 --- a/regress/scripts/test-bacula-dir.conf.in +++ b/regress/scripts/test-bacula-dir.conf.in @@ -19,7 +19,7 @@ Director { # define myself WorkingDirectory = "@working_dir@" PidDirectory = "@piddir@" SubSysDirectory = "@subsysdir@" - Maximum Concurrent Jobs = 1 + Maximum Concurrent Jobs = 4 Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password Messages = Standard } @@ -82,6 +82,7 @@ Job { Storage = File Messages = Standard Pool = Default + Maximum Concurrent Jobs = 4 Write Bootstrap = "@working_dir@/NightlySave.bsr" } @@ -193,6 +194,7 @@ Client { File Retention = 30d # 30 days Job Retention = 180d # six months AutoPrune = yes # Prune expired Jobs/Files + Maximum Concurrent Jobs = 4 } # Definiton of file storage device @@ -203,6 +205,7 @@ Storage { Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" Device = FileStorage Media Type = File + Maximum Concurrent Jobs = 4 } Storage { diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index 123cc0eb66..d2efe39db8 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -38,6 +38,7 @@ yes @sleep 1 wait messages +@output quit END_OF_DATA bin/bacula stop 2>&1 >/dev/null diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index 8de719c964..bd78419d42 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -21,6 +21,7 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <tmp/bscan.bsr bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <&1 >/dev/null diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index feaaeb1667..5a86849f04 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -19,6 +19,7 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <&1 >/dev/null diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index 913069ac8d..c6ae5b3cf8 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -28,6 +28,7 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <&1 >/dev/null diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index e8513a3f35..95dd325922 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -19,6 +19,7 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <&1 >/dev/null diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index beb38ce1c8..4921fdf0ff 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -17,10 +17,11 @@ echo " === Starting sparse-test ===" echo " === Starting sparse-test ===" >>working/log echo " " -bin/bacula start +bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <&1 >/dev/null diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index a3ab1df70b..a6e576731d 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -19,6 +19,7 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <&1 >/dev/null +grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null +bstat=$? +grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null +rstat=$? diff -r build /tmp/bacula-restores${cwd}/build -if [ $? != 0 ] ; then +if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " echo " ===== two-jobs-test Bacula source failed!!! ===== " diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 3b6fbf044f..de926bf6a5 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -19,8 +19,9 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <&1 >/dev/null diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index 36487d23b5..d6bd8e8348 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -19,6 +19,7 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/console -c bin/console.conf <