Update tests

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index e574f715afcf7d2f8a4297dd4537c217dac69df6..40f33f3897e19a8ccd8e72190a23087b00c2ccbf 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -57,6 +57,8 @@ nice tests/incremental-2disk
 nice tests/2drive-incremental-2disk
 nice tests/scratch-pool-test
 nice tests/2drive-concurrent-test
+nice tests/incremental-2media
+nice tests/three-pool-test
 echo " "
 echo "Test results"
 cat test.out

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index 0adf7cdd34f44de86e0f2ffa35a20792e22193d9..41385283fdd6facefd5d408c23837b727361d175 100644 (file)
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -154,7 +154,7 @@ Storage {
   SDPort = 8103
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
   Device = DiskChanger                      # must be same as Device in Storage daemon
-  Media Type = DiskChanger                  # must be same as MediaType in Storage daemon
+  Media Type = DiskChangerMedia             # must be same as MediaType in Storage daemon
   Maximum Concurrent Jobs = 4
   Autochanger = yes
 }

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index c40556c8f02ab7a94e7f62f078960142adf37b35..f62935592918b7a3498bfb6aa1d5ae0643b3078f 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -158,6 +158,19 @@ Storage {
 }
 
 
+# Definition of File storage device
+Storage {
+  Name = File
+  Address = @hostname@                # N.B. Use a fully qualified name here
+  SDPort = 8103
+  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
+  Device = FileStorage                # must be same as Device in Storage daemon
+  Media Type = FileMedia              # must be same as MediaType in Storage daemon
+  Maximum Concurrent Jobs = 4
+}
+
+
+
 # Generic catalog service
 Catalog {
   Name = MyCatalog

diff --git a/regress/scripts/bacula-sd-2disk.conf.in b/regress/scripts/bacula-sd-2disk.conf.in
index 5a1d8d88a2aa7fa6ba85a888c243dfa44fdd8a9b..109d83a2ce6d5adcb9ba27404ddd9133ec75bb4d 100644 (file)
--- a/regress/scripts/bacula-sd-2disk.conf.in
+++ b/regress/scripts/bacula-sd-2disk.conf.in
@@ -51,6 +51,17 @@ Device {
 # Maximum File Size = 1000000
 }
 
+Device {
+  Name = FileStorage
+  Media Type = FileMedia
+  Archive Device = @tmpdir@
+  LabelMedia = yes;                   # lets Bacula label unlabeled media
+  Random Access = Yes;
+  AutomaticMount = yes;               # when device opened, read it
+  RemovableMedia = no;
+  AlwaysOpen = no;
+}
+
 
 # 
 # Send all messages to the Director, 

diff --git a/regress/scripts/bacula-sd-migration.conf.in b/regress/scripts/bacula-sd-migration.conf.in
index db45c6bcb8646abc9d3601129563f2019240a374..f58cd4b5283acfdab1bed6c0e256dacca4ce3a27 100644 (file)
--- a/regress/scripts/bacula-sd-migration.conf.in
+++ b/regress/scripts/bacula-sd-migration.conf.in
@@ -41,7 +41,7 @@ Autochanger {
 Device {
   Name = Drive-0                   # 
   Device Type = File
-  Media Type = DiskChanger
+  Media Type = DiskChangerMedia
   Archive Device = @disk_drive@/drive0
   AutomaticMount = yes;               # when device opened, read it
   Autochanger = yes

diff --git a/regress/scripts/functions b/regress/scripts/functions
index e63cf3d7c22db4882f48e2996639fe598b311acc..fa674c42e04dcc0769394ba97c7e08b72e2d77d4 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -114,7 +114,7 @@ end_test()
    if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
       echo " "
       echo " "
-      echo "  !!!!! $TestName Bacula source failed!!! !!!!! "
+      echo "  !!!!! $TestName failed!!! !!!!! "
       echo "  !!!!! $TestName failed!!! !!!!! " >>test.out
       if [ $bstat != 0 -o $rstat != 0 ] ; then
          echo "  !!!!! Bad Job termination status     !!!!! "
@@ -125,7 +125,7 @@ end_test()
       fi
       echo " "
    else
-      echo "  ===== $TestName Bacula source OK `date +%R:%S` ===== "
+      echo "  ===== $TestName OK `date +%R:%S` ===== "
       echo "  ===== $TestName OK `date +%R:%S` ===== " >>test.out
       if test "$debug" -eq 0 ; then
          scripts/cleanup

diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
new file mode 100755 (executable)
index 0000000..c476b16
--- /dev/null
+++ b/regress/tests/incremental-2media
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory then create some           
+#   new files, do an Incremental onto a different medium 
+#   and then restore everything.
+#
+# This script uses the virtual disk autochanger
+#
+TestName="incremental-2media"
+JobName=Inc2media
+. scripts/functions
+
+. config.out
+
+scripts/cleanup
+scripts/copy-2disk-confs
+scripts/prepare-two-disks
+echo "${cwd}/build" >/tmp/file-list
+
+change_jobname $JobName
+start_test
+
+# Write out bconsole commands
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
+messages
+@$out tmp/log1.out
+label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=File volume=TestVolume002 Pool=Default
+run job=$JobName yes
+wait
+messages
+quit
+END_OF_DATA
+
+run_bacula
+
+echo "Backup 1 done"
+# make some files for the incremental to pick up
+touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
+touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
+messages
+@$out tmp/log1.out
+@# Force Incremental on the second Volume
+update volume=TestVolume001 VolStatus=Used
+setdebug level=51 storage=File
+run level=Incremental job=$JobName storage=File yes
+wait
+messages
+@# 
+@# now do a restore
+@#
+@$out tmp/log2.out
+setdebug level=51 storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select all done 
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bconsole
+
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+check_restore_diff
+
+end_test

diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test
index ab979daf84ce54534df5904443bf8eeb9f534f0d..d50d49748e096046e3b16c10222590cba664261c 100755 (executable)
--- a/regress/tests/migration-job-test
+++ b/regress/tests/migration-job-test
@@ -41,6 +41,7 @@ list jobs
 list volumes
 @#setdebug level=100 dir
 @# should migrate two jobs
+setdebug level=51 storage=DiskChanger
 run job=migrate-job yes
 wait
 messages
@@ -52,6 +53,7 @@ wait
 @# now do a restore
 @#
 @$out tmp/log2.out
+list volumes 
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *

diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index 2442773a1bbc56ad85f0555c18edff54475ff81c..11f040e59d4dd03a381fdd35bd5df58ed9b81eb6 100755 (executable)
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -33,7 +33,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-@#setdebug level=150 storage=DDS-4
+setdebug level=51 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full    drive=0
 label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc     drive=1
@@ -73,9 +73,11 @@ quit
 END_OF_DATA
 
 run_bconsole
+
 check_for_zombie_jobs storage=DDS-4
 stop_bacula
+
 check_two_logs
-check_restore_tmp_build_diff
+check_restore_diff
 
 end_test