ebl Add new tests

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5321 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in
index 5c7179539bb632b6baa026b29b7496eb9b551501..b83c91cf3cb821eb308228495dedb29bb6b45633 100644 (file)
--- a/regress/scripts/bacula-dir.conf.errors.in
+++ b/regress/scripts/bacula-dir.conf.errors.in
@@ -22,14 +22,15 @@ Director {                            # define myself
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
   Messages = Standard
-  fdconnecttimeout = 10
+  fdconnecttimeout = 20
+  sdconnecttimeout = 20
 }
 
 JobDefs {
   Name = "DefaultJob"
   Type = Backup
   Level = Incremental
-  Client = @hostname@-fd 
+  client=@hostname@-fd 
   Storage = File
   Messages = Standard
   Pool = Default
@@ -38,9 +39,9 @@ JobDefs {
 }
 
 Job {
-  Name = "LOCAL_INC_ERROR"
+  Name = "LOCAL_INC_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_LOCAL_INC_ERROR
+  FileSet = FS_LOCAL_INC_ERR
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
@@ -55,16 +56,16 @@ FileSet {
 }
 
 FileSet {
- Name = FS_REMOTE_INC_ERROR
+ Name = FS_REMOTE_INC_ERR
  Include {
    File="\</tmp/path/to/nowhere"
  }
 }
 
 Job {
-  Name = "REMOTE_INC_ERROR"
+  Name = "REMOTE_INC_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_REMOTE_INC_ERROR
+  FileSet = FS_REMOTE_INC_ERR
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
@@ -72,12 +73,12 @@ Job {
 }
 
 FileSet {
- Name = FS_LOCAL_INC_ERROR
+ Name = FS_LOCAL_INC_ERR
  Include { File=</tmp/path/to/nowhere }
 }
 
 FileSet {
- Name = FS_LOCAL_EXCL_ERROR
+ Name = FS_LOCAL_EXCL_ERR
  Include { File=</tmp/file-list }
  Exclude {
    File=</tmp/path/to/nowhere
@@ -85,9 +86,9 @@ FileSet {
 }
 
 Job {
-  Name = "LOCAL_EXCL_ERROR"
+  Name = "LOCAL_EXCL_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_LOCAL_EXCL_ERROR
+  FileSet = FS_LOCAL_EXCL_ERR
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
@@ -96,7 +97,7 @@ Job {
 
 
 FileSet {
- Name = FS_REMOTE_EXCL_ERROR
+ Name = FS_REMOTE_EXCL_ERR
  Include { File=</tmp/file-list }
  Exclude {
    File="\</tmp/path/to/nowhere"
@@ -104,16 +105,16 @@ FileSet {
 }
 
 Job {
-  Name = "REMOTE_EXCL_ERROR"
+  Name = "REMOTE_EXCL_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_REMOTE_EXCL_ERROR
+  FileSet = FS_REMOTE_EXCL_ERR
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
 }
 Job {
-  Name = "REMOTE_RUNSCRIPT_ERROR"
+  Name = "REMOTE_RUNSCRIPT_ERR"
   JobDefs = DefaultJob
   FileSet = FS_TEST
   RunBeforeJob = "/bin/echo RunBeforeJob"
@@ -122,7 +123,7 @@ Job {
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
 }
 Job {
-  Name = "LOCAL_RUNSCRIPT_ERROR"
+  Name = "LOCAL_RUNSCRIPT_ERR"
   JobDefs = DefaultJob
   FileSet = FS_TEST
   RunBeforeJob = "/bin/false"
@@ -140,6 +141,17 @@ Job {
   Run After Job = "/bin/echo RunAfterJob"
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
 }
+Job {
+  Name = "SD_CONNECT_TIMEOUT"
+  JobDefs = DefaultJob
+  Client = @hostname@-fd
+  FileSet = FS_TEST
+  Storage = File2
+  RunBeforeJob = "/bin/echo RunBeforeJob"
+  ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
 
 # Client (File Services) to backup
 Client {
@@ -178,6 +190,17 @@ Storage {
   Maximum Concurrent Jobs = 4
 }
 
+# Definiton of file storage device not responding
+Storage {
+  Name = File2
+  Address = @hostname@                # N.B. Use a fully qualified name here
+  SDPort = 7103
+  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
+  Device = FileStorage
+  Media Type = File2
+  Maximum Concurrent Jobs = 4
+}
+
 # Generic catalog service
 Catalog {
   Name = MyCatalog

diff --git a/regress/tests/errors-test b/regress/tests/errors-test
index a6ac810dce9be2b472e18088350ef4376cd8f67f..ca7e2bcd79c2f6d4587fe9bc70c064b3c2cdeb93 100755 (executable)
--- a/regress/tests/errors-test
+++ b/regress/tests/errors-test
@@ -13,7 +13,6 @@ copy_test_confs
 
 rm -f tmp/*.log
 /bin/cp -f scripts/bacula-dir.conf.errors bin/bacula-dir.conf
-
 echo "${cwd}/build/po" >/tmp/file-list
 
 start_test
@@ -21,35 +20,43 @@ start_test
 cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/LOCAL_INC_ERROR.log
-label volume=TestVolume001
-run job=LOCAL_INC_ERROR yes
+@output tmp/LOCAL_INC_ERR.log
+label storage=File volume=TestVolume001
+add storage=File2
+1
+File2
+1
+run job=LOCAL_INC_ERR yes
 wait
 messages
-@output tmp/REMOTE_INC_ERROR.log
-run job=REMOTE_INC_ERROR yes
+@output tmp/REMOTE_INC_ERR.log
+run job=REMOTE_INC_ERR yes
 wait
 messages
-@output tmp/LOCAL_EXCL_ERROR.log
-run job=LOCAL_EXCL_ERROR yes
+@output tmp/LOCAL_EXCL_ERR.log
+run job=LOCAL_EXCL_ERR yes
 wait
 messages
-@$out tmp/REMOTE_EXCL_ERROR.log
-run job=REMOTE_EXCL_ERROR yes
+@$out tmp/REMOTE_EXCL_ERR.log
+run job=REMOTE_EXCL_ERR yes
 wait
 messages
-@$out tmp/REMOTE_RUNSCRIPT_ERROR.log
-run job=REMOTE_RUNSCRIPT_ERROR yes
+@$out tmp/REMOTE_RUNSCRIPT_ERR.log
+run job=REMOTE_RUNSCRIPT_ERR yes
 wait
 messages
-@$out tmp/LOCAL_RUNSCRIPT_ERROR.log
-run job=LOCAL_RUNSCRIPT_ERROR yes
+@$out tmp/LOCAL_RUNSCRIPT_ERR.log
+run job=LOCAL_RUNSCRIPT_ERR yes
 wait
 messages
 @$out tmp/CLIENT_CONNECT_TIMEOUT.log
 run job=CLIENT_CONNECT_TIMEOUT yes
 wait
 messages
+@$out tmp/SD_CONNECT_TIMEOUT.log
+run job=SD_CONNECT_TIMEOUT yes
+wait
+messages
 status dir
 status storage=File
 quit
@@ -57,8 +64,9 @@ END_OF_DATA
 
 run_bacula
 touch tmp/log1.out
-check_for_zombie_jobs storage=File
-#stop_bacula
+client=$(grep client= bin/bacula-dir.conf)
+check_for_zombie_jobs storage=File $client
+stop_bacula
 
 dstat=0
 bstat=0
@@ -68,4 +76,4 @@ export bstat
 export rstat
 
 
-#end_test
+end_test