Update tape tests for pool

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

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index 7b6a0bebfa246c8c3428ed4454c42b6d91fa04e3..c0535e3d39d2893759976b405f3f1444958a62c9 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -5,6 +5,12 @@
 #   we can correctly append to a tape.
 #
 cwd=`pwd`
+debug=1
+if test "$debug" -eq 1 ; then
+  out="tee"
+else
+  out="output"
+fi
 scripts/copy-tape-confs
 scripts/cleanup-tape
 
@@ -16,12 +22,12 @@ echo " === Starting Backup Bacula tape test at `date +%R:%S` ==="
 echo " === Starting Backup Bacula tape test at `date +%R:%S` ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+# Write out bconsole commands
+cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+@$out tmp/log1.out
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 purge volume=TestVolume001
 relabel pool=Default storage=DDS-4 oldVolume=TestVolume001 volume=TestVolume002 slot=0
 purge volume=TestVolume002
@@ -62,37 +68,54 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages
 END_OF_DATA
+
+if test "$debug" -eq 1 ; then
+  bin/bacula start
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+fi
+
 bin/bacula stop 2>&1 >/dev/null
 #
 # Now do a second backup after making a few changes
 #
 touch ${cwd}/build/src/dird/*.c
 echo "test test" > ${cwd}/build/src/dird/xxx
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
-@output /dev/null
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 run job=NightlySave yes
 wait
 messages
 @# 
 @# now do a second restore
 @#
-@output tmp/log2.out
+@$out tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages
-@output
+@$out
 quit
 END_OF_DATA
+
+if test "$debug" -eq 1 ; then
+  bin/bacula start
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+fi
 scripts/check_for_zombie_jobs storage=DDS-4
 
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape
index 68472ae556c096a3d08c954b9681efcf4b120d02..3723b536dd64eaa84f61c123b3148cd84c7db79c 100755 (executable)
--- a/regress/tests/backup-win32-tape
+++ b/regress/tests/backup-win32-tape
@@ -21,7 +21,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @tee tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 @sleep 10
 status storage=DDS-4

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index 455fb052b1a5a81accb7ccce0a39e2685e8f492e..07c4aea41946a76fc8b97e5d34bab6a6dc72d992 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -28,7 +28,7 @@ estimate job=NightlySave listing
 messages
 @output tmp/log1.out
 setdebug level=2 storage=DDS-4
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 wait
 run job=NightlySave level=Full yes

diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape
index ab994ad16452e7b3aa1ce89b72c4c5ddc7ea092d..91a2a583cf86374cf840550bf3a9e78d2efa359e 100755 (executable)
--- a/regress/tests/fixed-block-size-tape
+++ b/regress/tests/fixed-block-size-tape
@@ -33,7 +33,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 wait
 messages

diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index a2d46fd72861e811159c8103300e0b82db825856..91a3dc9ae560d7bc8a179cddcfd4c02cccf16501 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -21,7 +21,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave level=Full Storage=DDS-4 yes
 run job=NightlySave level=Full Storage=DDS-4 yes
 run job=NightlySave level=Full Storage=DDS-4 yes

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index f78cd840a9b9f7d24f325a99be29f7eaea03154b..483af3d5bf140fe5cce89b988ac5fae9e1a395e6 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -24,7 +24,7 @@ estimate job=NightlySave listing
 estimate job=NightlySave listing
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 wait
 messages

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 44618f9724d5bffce379e4e53c12955dbd35cf77..4b827d7eb70f9a147f63ab4c81f84e39e0f7fb01 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -28,7 +28,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 wait
 messages

diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index 6b3a5b6e13bdae05dcacadfbe753aa0ad15cac89..795f3534ebe94e3533272a2c7bfa648b707aa496 100755 (executable)
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -23,7 +23,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave level=Full yes
 wait
 messages

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index c95f5ae763cad9c81f4b40ea16f403b0719a66dc..647c204e893dc7854a652cf7a2f2e707c11ee7e1 100755 (executable)
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -26,7 +26,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave level=Full yes
 wait
 messages

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 1b3410d6a37847989ae1c36840f1459735932ae2..4f8b0115d518bf25ae071a5828ec9c7f4dee0cf4 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -22,7 +22,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 setdebug level=2 storage=DDS-4
 run job=NightlySave yes
 wait

diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape
index 6ade802a9f35326af012c66b8b0b34bbeb4c387a..040540d2ade12f432e722ebe2a7e72cf57ec7a76 100755 (executable)
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -19,7 +19,7 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 @# do a bunch of saves so we have 12 files on the tape
 run job=NightlySave yes
 run level=Full job=NightlySave yes

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index b7acfb3bb065e6db3255ea71f5b6b282da44cd46..f87c0f448a3bec49c83ad5432b85077185173f5b 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -28,8 +28,8 @@ bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1
-label storage=DDS-4 volume=TestVolume002 slot=2
+label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default
+label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default
 update Volume=TestVolume001 MaxVolBytes=3000000
 run job=NightlySave yes
 wait