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 d063b45624899aed831a5235419890dc4f8fe17b..2fba967bef2aeec8db4c8ccad0da44d6e89aa157 100755 (executable)
--- 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 6dc0d244dc800c548d89a0217bd4d156002d24f3..1e83005da83f311942a204c32f4b615ccdd96357 100644 (file)
--- 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 113f54fa475358f834333254b3cedaaf553d9718..8ff990b5ef7c0f5504085d2c50e85bb1a7f67235 100644 (file)
--- 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 c7c4034935c354e9254cc03bead95a6e7d95dd5a..82ff4f54a09dab691d8d0c2546ce591a03320278 100755 (executable)
--- 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 23d3fddf8c9f773087ef82eeaa52e2e302e699bc..edeea9e5d8696eeac7362ffb015e16d4558cb1bd 100755 (executable)
--- 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 c7adb3b52acb4ae6dc48d65bc1ad9ebc51d04633..24ce9cff9ae7affe951467a666f14f5a2e46d60a 100755 (executable)
--- 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 c0d9b2b9941b808f2e22148bfeb9aa7a632d1610..a25d8bd9c631bc6f3f73bb8efcd908a56faafb06 100755 (executable)
--- 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 0ec78a487303d1e825dc78afb66305750b57d4b5..d6e826300b84a9e11ea0cb9bc538104543f6a20c 100755 (executable)
--- 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 9d536dc2f74487460901f2feb0b7d127cf5b3d4f..b8ed84ef8096baffe5d2148e4262cae30dd3a428 100755 (executable)
--- 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 374d988337065dcc89de79318d18363e9187026a..e2671141b1ae71bdb5930d46827068bce6208fc0 100755 (executable)
--- 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 5d39ab13e2e1c2477b160ebd3907fd3b4a4ee570..5cd729795618095f1e1c466ae24b4f6f4535a0f5 100755 (executable)
--- 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