From ad2b795e2a559d5e8fe00ced30acbe6ed493fadf Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Mon, 13 Apr 2009 13:01:49 +0000 Subject: [PATCH] ebl more fixes about pool=defaults git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8723 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/tests/broken-media-bug-test | 4 ++-- regress/tests/bug-897 | 2 +- regress/tests/bug-fatal-test | 2 +- regress/tests/debug-test | 2 +- regress/tests/dev-test-root | 2 +- regress/tests/errors-test | 2 +- regress/tests/etc-test-root | 2 +- regress/tests/fifo-test | 2 +- regress/tests/four-concurrent-jobs-test | 4 ++-- regress/tests/gigaslam-sparse-test | 2 +- regress/tests/lib-tape-root | 2 +- regress/tests/lib-test-root | 2 +- regress/tests/multi-client-test | 4 ++-- regress/tests/sparse-compressed-test | 2 +- regress/tests/sparse-encrypt-test | 2 +- regress/tests/sparse-test | 2 +- regress/tests/two-jobs-test | 2 +- regress/tests/two-vol-test | 4 ++-- regress/tests/usr-tape-root | 2 +- regress/tests/verify-vol-test | 2 +- regress/tests/verify-voltocat-test | 2 +- regress/tests/weird-files-test | 2 +- regress/tests/weird-files2-test | 2 +- regress/tests/win32-test | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) diff --git a/regress/tests/broken-media-bug-test b/regress/tests/broken-media-bug-test index 3e6aa51a45..42293d0751 100644 --- 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 4b9de5438b..f38dd97dff 100755 --- a/regress/tests/bug-897 +++ b/regress/tests/bug-897 @@ -32,7 +32,7 @@ start_test cat <${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 0677657810..a0b1f0cf2a 100755 --- a/regress/tests/bug-fatal-test +++ b/regress/tests/bug-fatal-test @@ -23,7 +23,7 @@ start_test cat <${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 f1e95362da..e4c3c32422 100755 --- a/regress/tests/debug-test +++ b/regress/tests/debug-test @@ -17,7 +17,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 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 0d005e56b7..cab86fc0fd 100755 --- a/regress/tests/dev-test-root +++ b/regress/tests/dev-test-root @@ -19,7 +19,7 @@ cat <${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 5a57c42350..a3f028823c 100755 --- a/regress/tests/errors-test +++ b/regress/tests/errors-test @@ -21,7 +21,7 @@ cat <${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 50a45f2cbf..6be6fad540 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -16,7 +16,7 @@ cat <${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 c0dcd4232f..5b35b0992d 100755 --- a/regress/tests/fifo-test +++ b/regress/tests/fifo-test @@ -22,7 +22,7 @@ cat <${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 6f10087dbc..58d38d89b4 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -20,9 +20,9 @@ cat <${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 f3b560af07..ce07f16947 100755 --- a/regress/tests/gigaslam-sparse-test +++ b/regress/tests/gigaslam-sparse-test @@ -25,7 +25,7 @@ cat >${cwd}/tmp/bconcmds < >${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 54da62c7d4..739e042acb 100755 --- a/regress/tests/lib-test-root +++ b/regress/tests/lib-test-root @@ -19,7 +19,7 @@ cat <${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 fb61105d19..01c9bdd2e8 100755 --- 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 47e05e41c1..fa25d47cbd 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -18,7 +18,7 @@ cat >${cwd}/tmp/bconcmds <${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 38d12fd998..0c64b34bbe 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -17,7 +17,7 @@ cat >${cwd}/tmp/bconcmds <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 8d551aca66..7493dfb472 100755 --- a/regress/tests/usr-tape-root +++ b/regress/tests/usr-tape-root @@ -19,7 +19,7 @@ cat < ${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 c51228d8ea..c1ac0011dc 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -26,7 +26,7 @@ cat <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 1cf26d7baa..28f69d1ad4 100755 --- a/regress/tests/verify-voltocat-test +++ b/regress/tests/verify-voltocat-test @@ -31,7 +31,7 @@ cat <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 920ca7c60a..75049b7782 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -37,7 +37,7 @@ cat <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 9a8e1dce3b..7616cc71d9 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -31,7 +31,7 @@ cat <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 9f1568b62c..5718a22c06 100755 --- 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 -- 2.39.5