From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 19 Jun 2007 21:57:49 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~6110
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=edc0a98d1dc60ec5e2c90c9b845481e8e588bbda;p=bacula%2Fbacula

Update

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index e979a646ed..b4e5b170be 100755
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -59,6 +59,7 @@ nice tests/scratch-pool-test
 nice tests/2drive-concurrent-test
 nice tests/incremental-2media
 nice tests/three-pool-test
+nice tests/2drive-3pool-test
 echo " "
 echo "Test results"
 cat build/config.out
diff --git a/regress/tests/2drive-3pool-test b/regress/tests/2drive-3pool-test
new file mode 100755
index 0000000000..c463c0cf54
--- /dev/null
+++ b/regress/tests/2drive-3pool-test
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory. Create three
+#   tapes, each in a different pool, then run some jobs asking for the
+#   volume on drive three.  It should find it without moving the 
+#   volume.
+#
+# This script uses the virtual disk autochanger and two drives
+#
+TestName="2drive-3pool-disk"
+JobName="2dr3pooldisk"
+. scripts/functions
+
+scripts/cleanup
+scripts/copy-2disk-drive-confs
+scripts/prepare-two-disks
+
+echo "${cwd}/build" >/tmp/file-list
+change_jobname NightlySave $JobName
+start_test
+
+# Turn off Prefer Mounted Volumes so we use 2 drives
+# outf="tmp/sed_tmp"
+#  echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
+# cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
+# Comment the next line out to write everything to one drive
+#  otherwise, it writes the two jobs to different drives
+# sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
+
+# Write out bconsole commands
+cat <<END_OF_DATA >tmp/bconcmds
+@output /dev/null
+messages
+@$out tmp/log1.out
+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=1
+@#label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc     drive=2
+status storage=DDS-4
+@#run job=$JobName level=Full Pool=Inc yes
+run job=$JobName level=Full Pool=Full yes
+run job=$JobName level=Full Pool=Default yes
+setdebug level=200 storage=DDS-4
+run job=$JobName level=Full Pool=Default yes
+run job=$JobName level=Full Pool=Default yes
+@sleep 10
+status storage=DDS-4
+list volumes
+wait
+list volumes
+list jobs
+status storage=DDS-4
+messages
+quit
+END_OF_DATA
+
+# exit
+
+run_bacula
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
+messages
+@# 
+@# now do a restore
+@#
+@$out tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bconsole
+
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
+check_two_logs
+check_restore_diff
+
+end_test
diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index 6a472a3625..ab34b373fe 100755
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -32,7 +32,8 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-setdebug level=51 storage=DDS-4
+setdebug level=200 storage=DDS-4
+setdebug level=200 client 
 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