ebl more fixes about pool=defaults

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

diff --git a/regress/tests/broken-media-bug-test b/regress/tests/broken-media-bug-test
index 3e6aa51a457eac0e6313a5e02989d67c0e5fbbce..42293d07511b6cde5943ddb2403635dc32d7f6fa 100644 (file)
--- a/regress/tests/broken-media-bug-test
+++ b/regress/tests/broken-media-bug-test
@@ -38,8 +38,8 @@ messages
 @$out tmp/log1.out
 setdebug level=150  storage=File
 setdebug level=150  Director
-label storage=File volume=TestVolume0001
-label storage=File volume=TestVolume0002
+label storage=File volume=TestVolume0001 pool=Default
+label storage=File volume=TestVolume0002 pool=Default
 run job=First yes
 messages
 quit

diff --git a/regress/tests/bug-897 b/regress/tests/bug-897
index 4b9de5438b46ed09f752099320f8315759e37970..f38dd97dff1442aa717dbfd4bd650787ad2d1704 100755 (executable)
--- a/regress/tests/bug-897
+++ b/regress/tests/bug-897
@@ -32,7 +32,7 @@ start_test
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-label volume=TestVolume001
+label volume=TestVolume001 pool=Default
 @$out ${cwd}/tmp/RUN_FD_FAILED.log
 run job=RUN_FD_FAILED yes
 wait

diff --git a/regress/tests/bug-fatal-test b/regress/tests/bug-fatal-test
index 06776578100938628c23e86b45f4f85ca1d68b6b..a0b1f0cf2a8d1eb1f6f7dd813df383ce40d48914 100755 (executable)
--- a/regress/tests/bug-fatal-test
+++ b/regress/tests/bug-fatal-test
@@ -23,7 +23,7 @@ start_test
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-label volume=TestVolume001
+label volume=TestVolume001 pool=Default
 @$out ${cwd}/tmp/RUN_BUG_FATAL.log
 run job=BUG_FATAL yes
 wait

diff --git a/regress/tests/debug-test b/regress/tests/debug-test
index f1e95362dad3c19639c81bcfb2aee0749d3f7a87..e4c3c324220711460dee719db8c373ccccd4adac 100755 (executable)
--- a/regress/tests/debug-test
+++ b/regress/tests/debug-test
@@ -17,7 +17,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume001 pool=Default
 update volume=TestVolume001 MaxVolBytes=1000
 run job=$JobName storage=File1 yes
 @sleep 5

diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index 0d005e56b7f0a21d970504406586f00152e9288f..cab86fc0fd7200aa788af38798e2c640674cc0c0 100755 (executable)
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=NightlySave yes
 wait
 messages

diff --git a/regress/tests/errors-test b/regress/tests/errors-test
index 5a57c42350469daa97670d8ced79b7cb1cc2c6b7..a3f028823c7c8c09a2652ba391e60d6001bfed94 100755 (executable)
--- a/regress/tests/errors-test
+++ b/regress/tests/errors-test
@@ -21,7 +21,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/LOCAL_INC_ERR.log
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 add storage=File2
 1
 File2

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 50a45f2cbf719fccbeb5e5b73b76118204add51a..6be6fad540ef2c0d9b370366989ec5660b53d315 100755 (executable)
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -16,7 +16,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
-label storage=File
+label storage=File pool=Default
 TestVolume001
 run job=NightlySave
 yes

diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test
index c0dcd4232fada43e36827570ce5e7733289954c3..5b35b0992dd4a4fbacb384139250ac0df9827ae0 100755 (executable)
--- a/regress/tests/fifo-test
+++ b/regress/tests/fifo-test
@@ -22,7 +22,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume001 pool=Default
 run job=$JobName storage=File1 yes
 wait
 messages

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 6f10087dbc14b8ab2158bf3e873f352ce690273b..58d38d89b4205fad4d861e434d88a63355f633e4 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -20,9 +20,9 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out   ${cwd}/tmp/log1.out
-label storage=File1
+label storage=File1 pool=Default
 TestVolume001
-label storage=File1
+label storage=File1 pool=Default
 TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000

diff --git a/regress/tests/gigaslam-sparse-test b/regress/tests/gigaslam-sparse-test
index f3b560af07c878d473ac1bdfb02a3467be3d6082..ce07f169479b4c56b9f9ad7b1fb020f965b4c45e 100755 (executable)
--- a/regress/tests/gigaslam-sparse-test
+++ b/regress/tests/gigaslam-sparse-test
@@ -25,7 +25,7 @@ cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root
index 9044d1c088c7968967fe6d4373d6941834c249bd..5f792c064d76fa8aa0d33107ee5fe79ea61998fa 100755 (executable)
--- a/regress/tests/lib-tape-root
+++ b/regress/tests/lib-tape-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA > >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/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/lib-test-root b/regress/tests/lib-test-root
index 54da62c7d459c72119abcf6d8e2afbb9c562b47b..739e042acbccd759a49183c41e497f27c09fc8b4 100755 (executable)
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
-label storage=File
+label storage=File pool=Default
 TestVolume001
 run job=NightlySave
 yes

diff --git a/regress/tests/multi-client-test b/regress/tests/multi-client-test
index fb61105d19e927bf545e21abdef9dcbd70998612..01c9bdd2e884e1b757c33477db8d24429571d0e1 100755 (executable)
--- a/regress/tests/multi-client-test
+++ b/regress/tests/multi-client-test
@@ -27,9 +27,9 @@ status client=${hostname1}-fd
 status client=${hostname2}-fd
 status client=${hostname3}-fd
 setdebug level=1 dir
-label storage=File1
+label storage=File1 pool=Default
 TestVolume001
-label storage=File1
+label storage=File1 pool=Default
 TestVolume002
 update Volume=TestVolume001 MaxVolBytes=900000000
 status storage=File1

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 47e05e41c179819678fc5702212ba79406e3c5ff..fa25d47cbd1c554e3d20bb77c424f80abeaa0c91 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -18,7 +18,7 @@ cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=SparseCompressedTest yes
 wait
 messages

diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test
index 865b739b49da841a6ab528cf4605870b4641a377..198342a8a82fb1f542da05a20830e37ebfa44b50 100755 (executable)
--- a/regress/tests/sparse-encrypt-test
+++ b/regress/tests/sparse-encrypt-test
@@ -25,7 +25,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 setdebug level=10 fd
 run job=$JobName yes
 wait

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 38d12fd9989e4d83a5e96944376fcaad79274eb0..0c64b34bbe68d0732915513591e138b0d71a9bb8 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -17,7 +17,7 @@ cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index b8f8e8f87fc80f7b3175c11acf5e7d894fbe81be..f87aa55cc31a25dd24626e75c34700010352b805 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -25,7 +25,7 @@ estimate job=$JobName
 estimate job=$JobName
 messages
 @$out tmp/log1.out
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 15f48ee5b24f32fd013182af366dee528707f12f..50d7bde8ac702b9950fc8e999700048593a5b68b 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -19,8 +19,8 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=File1 volume=TestVolume002
-label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume002 pool=Default
+label storage=File1 volume=TestVolume001 pool=Default
 update Volume=TestVolume002 MaxVolBytes=3000000
 run job=$JobName storage=File1 yes
 wait

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 8d551aca6630e3002829815b4e385399c7bec270..7493dfb472b51bdebda7f647dbd2cbc6be12f69d 100755 (executable)
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA > ${cwd}/tmp/bconcmds
 @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/verify-vol-test b/regress/tests/verify-vol-test
index c51228d8ea8957675324923c0a33a15ea2750462..c1ac0011dca8d723630f524cbc4c8f6336dbe124 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -26,7 +26,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 setdebug level=1 storage=File sd
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/verify-voltocat-test b/regress/tests/verify-voltocat-test
index 1cf26d7baa076d54b933bc31409208b6e65672eb..28f69d1ad49fb6ef3bc992a4806299d4a9b03f00 100755 (executable)
--- a/regress/tests/verify-voltocat-test
+++ b/regress/tests/verify-voltocat-test
@@ -31,7 +31,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 setdebug level=1 storage=File sd
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 920ca7c60a8d822cc1aa87736df84559e7572ffe..75049b77821731357417386ed245cf03558159b7 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -37,7 +37,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=File
+label storage=File pool=Default
 TestVolume001
 run job=$JobName    
 yes

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 9a8e1dce3b0964b587ec0b36f456efc6a5f4af84..7616cc71d973f6dc37d1a123b1fc0ebe80c0a051 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -31,7 +31,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/win32-test b/regress/tests/win32-test
index 9f1568b62cf2864723fe33f9ef88c424d8a6ea94..5718a22c06ee04846d69bc5a7c3c73af67a1c77d 100755 (executable)
--- a/regress/tests/win32-test
+++ b/regress/tests/win32-test
@@ -21,7 +21,7 @@ messages
 status all
 status all
 messages
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 pool=Default
 setdebug level=100 dir
 run job=$JobName storage=File yes
 wait