From: Eric Bollengier Date: Mon, 13 Apr 2009 12:54:34 +0000 (+0000) Subject: ebl more fixes X-Git-Tag: Release-3.0.1~47 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=735961d684996a81b032b0363dace523c23a4234;p=bacula%2Fbacula 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 a671c0b3d2..e9e9dba955 100755 --- a/regress/tests/maxvol-test +++ b/regress/tests/maxvol-test @@ -24,10 +24,10 @@ cat <${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 7fe6c2befe..c8f5db0dd7 100755 --- a/regress/tests/maxvol2-test +++ b/regress/tests/maxvol2-test @@ -20,9 +20,9 @@ cat <${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 a7aa70538e..8bdfad1de9 100755 --- a/regress/tests/plugin-test +++ b/regress/tests/plugin-test @@ -18,7 +18,7 @@ cat <${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 a4d365e1fe..64bf87ce70 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -25,8 +25,8 @@ cat <${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 701a0083e7..bc822fe41c 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -25,10 +25,10 @@ cat <${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 5d6ffc4884..8b3d2f4360 100755 --- a/regress/tests/regexwhere-test +++ b/regress/tests/regexwhere-test @@ -30,7 +30,7 @@ start_test cat <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 04b448d82d..1beca6012f 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -27,7 +27,7 @@ cat <${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 38fc0f7b7b..ecc31df570 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -52,7 +52,7 @@ cat <${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 1a4553ab14..1e5f00df07 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -18,7 +18,7 @@ cat <${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 d687c7d526..6f2b4d58fe 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -20,10 +20,10 @@ cat <${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