From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 16 May 2003 22:08:38 +0000 (+0000)
Subject: Update tests
X-Git-Tag: Release-1.31~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c37d94ac16c7b3c019e2b665c45c9141943987e0;p=bacula%2Fbacula

Update tests


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

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index d063b45624..2fba967bef 100755
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -7,7 +7,8 @@ echo "s%@scriptdir@%${cwd}/bin%g" >>${out}
 echo "s%@working_dir@%${cwd}/bin/working%g" >>${out}
 echo "s%@piddir@%${cwd}/bin/working%g" >>${out}
 echo "s%@subsysdir@%${cwd}/bin/working%g" >>${out}
-echo "s%@job_email@%${1}%g">>${out}
+echo "s%@job_email@%${1}%g" >>${out}
+echo "s%@tmpdir@%${cwd}/tmp%g" >>${out}
 
 # process .in files with sed script
 sed -f ${out} ${cwd}/scripts/test-bacula-dir.conf.in >${cwd}/scripts/test-bacula-dir.conf
diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 6dc0d244dc..1e83005da8 100644
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -38,6 +38,18 @@ Job {
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
 }
 
+Job {
+  Name = "MonsterSave"
+  Type = Backup
+  Client=rufus-fd 
+  FileSet="Full Set"
+  Storage = File1
+  Messages = Standard
+  Pool = Default
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
+}
+
+
 Job {
   Name = "VerifyVolume"
   Type = Verify
@@ -193,6 +205,16 @@ Storage {
   Media Type = File
 }
 
+Storage {
+  Name = File1
+  Address = rufus                # N.B. Use a fully qualified name here
+  SDPort = 8103
+  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
+  Device = FileStorage1
+  Media Type = File1
+}
+
+
 # Definition of DLT tape storage device
 #Storage {
 #  Name = DLTDrive
diff --git a/regress/scripts/test-bacula-sd.conf.in b/regress/scripts/test-bacula-sd.conf.in
index 113f54fa47..8ff990b5ef 100644
--- a/regress/scripts/test-bacula-sd.conf.in
+++ b/regress/scripts/test-bacula-sd.conf.in
@@ -43,6 +43,18 @@ Device {
   AlwaysOpen = no;
 }
 
+Device {
+  Name = FileStorage1
+  Media Type = File1
+  Archive Device = @tmpdir@
+  LabelMedia = yes;                   # lets Bacula label unlabelled media
+  Random Access = Yes;
+  AutomaticMount = yes;               # when device opened, read it
+  RemovableMedia = no;
+  AlwaysOpen = no;
+}
+
+
 #Device {
 #  Name = "HP DLT 80"
 #  Media Type = DLT8000
diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index c7c4034935..82ff4f54a0 100755
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -21,7 +21,7 @@ bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output
-label
+label storage=File
 TestVolume001
 run job=CompressedTest
 yes
diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index 23d3fddf8c..edeea9e5d8 100755
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -27,7 +27,7 @@ bin/bacula start
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-label
+label storage=File
 TestVolume001
 run job=NightlySave
 yes
diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index c7adb3b52a..24ce9cff9a 100755
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -27,7 +27,7 @@ bin/bacula start
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-label
+label storage=File
 TestVolume001
 run job=NightlySave
 yes
diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root
index c0d9b2b994..a25d8bd9c6 100755
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -27,7 +27,7 @@ bin/bacula start
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-label
+label storage=File
 TestVolume001
 run job=NightlySave
 yes
diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 0ec78a4873..d6e826300b 100755
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -21,7 +21,7 @@ bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output
-label
+label storage=File
 TestVolume001
 run job=SparseCompressedTest
 yes
diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 9d536dc2f7..b8ed84ef80 100755
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -21,7 +21,7 @@ bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output
-label
+label storage=File
 TestVolume001
 run job=SparseTest
 yes
diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 374d988337..e2671141b1 100755
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -20,7 +20,7 @@ bin/bacula start
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-label
+label storage=File
 TestVolume001
 run job=CompressedTest
 yes
@@ -30,6 +30,9 @@ quit
 END_OF_DATA
 echo "Backup 1 done"
 touch ${cwd}/build/src/dird/*.c
+#
+# run a second job
+#
 bin/console -c bin/console.conf <<END_OF_DATA
 run job=CompressedTest
 yes
diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 5d39ab13e2..5cd7297956 100755
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -21,7 +21,7 @@ bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output
-label
+label storage=File
 TestVolume001
 run job=NightlySave
 yes