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 de3aebc524b293cbe55ff16e8322d87206ed7345..fd3ad15ef3ad4f977b0ac03f742a3c08f4f05b0e 100755 (executable)
--- 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 e2257b217fb84f7caaecc3eb9e03251240afe281..8658fb9fd98b95df5010eab5e094d217bbf7727f 100755 (executable)
--- 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 94bd6f1b36fbd5a4bbf5dfce1abbe4c1a2f4af26..d210e966d4612eb319e6831ee7a84f8a9b63ef82 100644 (file)
--- 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 123cc0eb66758f087f84e23a48d83b6b6a9657a9..d2efe39db8c851b6cd2c26a1e8b510809a6d099f 100755 (executable)
--- 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 8de719c964fbcd6ffc8f168eb0685ee1f069272a..bd78419d420fb3d32acee0444c948dc29d51bf14 100755 (executable)
--- 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 <<END_OF_DATA
+@output /dev/null
 messages
 @output tmp/log1.out
 label storage=File1
@@ -53,6 +54,7 @@ echo "volume=TestVolume001|TestVolume002" >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 <<END_OF_DATA
+@output /dev/null
 messages
 @output tmp/log2.out
 @# 
@@ -64,6 +66,7 @@ done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index feaaeb16675493ede79e6d6f1675ab725aba275a..5a86849f0487a881040fcd21b14bf145c1bab68c 100755 (executable)
--- 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 <<END_OF_DATA
+@output /dev/null
 messages
 @output tmp/log1.out
 label storage=File
@@ -37,6 +38,7 @@ done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 913069ac8d14c6755270f0028220cfbc0d8aaee7..c6ae5b3cf828d4983dc99d9c54b7e4dda5d87714 100755 (executable)
--- 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 <<END_OF_DATA
+@output /dev/null
 messages
 @output tmp/log1.out
 run job=MultiVol storage=File
@@ -44,6 +45,7 @@ done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 bin/bacula stop  2>&1 >/dev/null

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index e8513a3f358f188b3f2a3a76c81d4ee784d00289..95dd325922d4ab0bf00e2ebb8743dff2abfb2321 100755 (executable)
--- 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 <<END_OF_DATA
+@output /dev/null
 messages
 @output tmp/log1.out
 label storage=File
@@ -37,6 +38,7 @@ done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index beb38ce1c8779a69a783827ad4da9658e2713421..4921fdf0ff4b3d0a995bd516b948f9fae3bde858 100755 (executable)
--- 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 <<END_OF_DATA
+@output /dev/null
 messages
-@output tmp/log2.out
+@output tmp/log1.out
 label storage=File
 TestVolume001
 run job=SparseTest
@@ -37,6 +38,7 @@ done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index a3ab1df70b7cc072980b558a2deb391ce8c6790b..a6e576731d6bcb768c4cb9acd455c088d4c954be 100755 (executable)
--- 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 <<END_OF_DATA
+@output /dev/null
 messages
 @output tmp/log1.out
 label storage=File
@@ -51,11 +52,16 @@ done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&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 3b6fbf044f55d13a604702297c81c58d0839a8ca..de926bf6a59ab566b06180b794bde74688b51c3f 100755 (executable)
--- 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 <<END_OF_DATA
-@output tmp/log1.out
+@output /dev/null
 messages
+@output tmp/log1.out
 label storage=File1
 TestVolume001
 label storage=File1
@@ -43,6 +44,7 @@ done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 36487d23b54f28e924b2d0d8b8a814c642c47a24..d6bd8e8348fa04080557f511dd6ff4123fea6ad7 100755 (executable)
--- 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 <<END_OF_DATA
+@output /dev/null
 messages
 @output tmp/log1.out
 label storage=File
@@ -35,6 +36,7 @@ run job=VerifyVolume
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
 sleep 2