ebl more fixes

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

diff --git a/regress/tests/maxvol-test b/regress/tests/maxvol-test
index a671c0b3d20c2b3ab3f55882147e60f936869790..e9e9dba95580c1f033c61eaaea96069b46297cc8 100755 (executable)
--- a/regress/tests/maxvol-test
+++ b/regress/tests/maxvol-test
@@ -24,10 +24,10 @@ 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=TestVolume002
-label storage=File1 volume=TestVolume003
-label storage=File1 volume=TestVolume004
+label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume002 pool=Default
+label storage=File1 volume=TestVolume003 pool=Default
+label storage=File1 volume=TestVolume004 pool=Default
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12

diff --git a/regress/tests/maxvol2-test b/regress/tests/maxvol2-test
index 7fe6c2befee6ed51abf9d830063ae0b864e4e8a5..c8f5db0dd78828a2ac5054e6781c861fcc790ad1 100755 (executable)
--- a/regress/tests/maxvol2-test
+++ b/regress/tests/maxvol2-test
@@ -20,9 +20,9 @@ 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=TestVolume002
-label storage=File1 volume=TestVolume003
+label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume002 pool=Default
+label storage=File1 volume=TestVolume003 pool=Default
 update Volume=TestVolume001 volretention=10s
 update Volume=TestVolume001 maxvoljobs=1
 update Volume=TestVolume002 volretention=10s

diff --git a/regress/tests/plugin-test b/regress/tests/plugin-test
index a7aa70538e36ea080580b02f00ca964efdc49de5..8bdfad1de949b66abb335fc11a868500b8b9a933 100755 (executable)
--- a/regress/tests/plugin-test
+++ b/regress/tests/plugin-test
@@ -18,7 +18,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
 setdebug level=150 client=$CLIENT
 estimate job=$JobName level=Full
 setdebug level=50 client=$CLIENT

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

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 701a0083e78fd0f5b7fad47cba4d2c7ac07981e9..bc822fe41cd7fab334372d103eca215e3bc98b65 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -25,10 +25,10 @@ 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=TestVolume002
-label storage=File1 volume=TestVolume003
-label storage=File1 volume=TestVolume004
+label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume002 pool=Default
+label storage=File1 volume=TestVolume003 pool=Default
+label storage=File1 volume=TestVolume004 pool=Default
 @# Note, this is going to fail if the pruning gets
 @#  to tight because the saved volume is too large.
 @#  In that case, either add another volume, or

diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test
index 5d6ffc488481af07a124a92c6ac473a251bea69b..8b3d2f43606eaa72ec2b2bbc7ef3dba43cb54f75 100755 (executable)
--- a/regress/tests/regexwhere-test
+++ b/regress/tests/regexwhere-test
@@ -30,7 +30,7 @@ start_test
 cat <<END_OF_DATA >tmp/bconcmds
 @$out tmp/RUN_backup
 messages
-label volume=TestVolume001
+label volume=TestVolume001 pool=Default
 run job=backup yes
 wait
 messages

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 04b448d82dfcbd529334bca2d8a9725e43c8aefe..1beca6012f01f6c5a48c074d5011b35cc7638821 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @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/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 38fc0f7b7ba781e30fbb43bcb2b19df6d93c1256..ecc31df5700c774f5015a0451826e4b7e219f28c 100755 (executable)
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -52,7 +52,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
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 1a4553ab14693a0ecfe2edefd1afee0e35260934..1e5f00df078eeaf838fbd2571093a3332a03e31e 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -18,7 +18,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @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/span-vol-test b/regress/tests/span-vol-test
index d687c7d5268bc038e87f1540848371dbdfbbca77..6f2b4d58fe74f9d6a1f6ac377d3f36af901c4eb7 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -20,10 +20,10 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume004
-label storage=File1 volume=TestVolume003
-label storage=File1 volume=TestVolume002
-label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume004 pool=Default
+label storage=File1 volume=TestVolume003 pool=Default
+label storage=File1 volume=TestVolume002 pool=Default
+label storage=File1 volume=TestVolume001 pool=Default
 update Volume=TestVolume004 MaxVolBytes=3000000
 update Volume=TestVolume003 MaxVolBytes=3000000
 update Volume=TestVolume002 MaxVolBytes=3000000