From f7772b109f33d60e676f4b815a5438e8707652b9 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 27 May 2008 14:14:05 +0000 Subject: [PATCH] Update tests git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7037 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/functions | 1 + regress/tests/2drive-2disk | 2 +- regress/tests/2drive-incremental-2disk | 2 +- regress/tests/accurate-test | 3 +-- regress/tests/bug-897 | 2 +- regress/tests/fifo-test | 2 +- regress/tests/strip-test | 4 ++-- regress/tests/three-pool-test | 2 +- regress/tests/tls-authenticate-test | 2 +- regress/tests/two-volume-changer | 2 +- regress/tests/two-volume-test | 2 +- regress/tests/virtual-changer-test | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/regress/scripts/functions b/regress/scripts/functions index b583255680..6ddd0570c5 100644 --- a/regress/scripts/functions +++ b/regress/scripts/functions @@ -281,3 +281,4 @@ fi # Source the configuration variables . ${cwd}/config +CLIENT=${HOST}-fd diff --git a/regress/tests/2drive-2disk b/regress/tests/2drive-2disk index 103768afde..d28258aa86 100755 --- a/regress/tests/2drive-2disk +++ b/regress/tests/2drive-2disk @@ -33,7 +33,7 @@ messages @$out ${cwd}/tmp/log1.out setdebug level=3 dir setdebug level=3 storage=DDS-4 -setdebug level=3 client +setdebug level=3 client=$CLIENT label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=1 # label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 status storage=DDS-4 diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk index da1e6016a2..684965c2c5 100755 --- a/regress/tests/2drive-incremental-2disk +++ b/regress/tests/2drive-incremental-2disk @@ -41,7 +41,7 @@ messages @$out ${cwd}/tmp/log1.out setdebug level=3 dir setdebug level=3 storage=DDS-4 -setdebug level=3 client +setdebug level=3 client=2drive2disk label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 status storage=DDS-4 diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test index cfa545590e..a94449149f 100755 --- a/regress/tests/accurate-test +++ b/regress/tests/accurate-test @@ -364,7 +364,7 @@ rm -rf ${cwd}/tmp/bacula-restores cat <${cwd}/tmp/bconcmds @$out ${cwd}/tmp/log1.out -setdebug level=1 client +setdebug level=1 client=$CLIENT run job=backup fileset=FS_TESTJOB2 yes wait messages @@ -405,4 +405,3 @@ fi stop_bacula end_test - diff --git a/regress/tests/bug-897 b/regress/tests/bug-897 index 67d0c2f2bb..4b9de5438b 100755 --- a/regress/tests/bug-897 +++ b/regress/tests/bug-897 @@ -39,7 +39,7 @@ wait messages @sleep 1 @$out ${cwd}/tmp/RUN_BUG_897.log -setdebug level=200 client +setdebug level=200 client=$CLIENT run job=BUG_897 yes @sleep 2 cancel diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test index e994caeafc..c0dcd4232f 100755 --- a/regress/tests/fifo-test +++ b/regress/tests/fifo-test @@ -39,7 +39,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -@#setdebug level=50 client +@#setdebug level=50 client=$CLIENT restore where=/ select all storage=File1 done yes wait diff --git a/regress/tests/strip-test b/regress/tests/strip-test index 68a3d68931..6b86ce4ac9 100755 --- a/regress/tests/strip-test +++ b/regress/tests/strip-test @@ -21,7 +21,7 @@ messages @$out ${cwd}/tmp/log1.out @#setdebug level=150 dir @#setdebug level=150 storage=FileStorage -setdebug level=100 client +setdebug level=100 client=$CLIENT label storage=FileStorage pool=Default volume=TestVolume001 run job=$JobName storage=FileStorage pool=Default yes wait @@ -39,7 +39,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -@#setdebug level=50 client +@#setdebug level=50 client=$CLIENT restore where=${cwd}/tmp/bacula-restores select all storage=FileStorage done yes wait diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test index 92ff97f656..2f72ee42b9 100755 --- a/regress/tests/three-pool-test +++ b/regress/tests/three-pool-test @@ -33,7 +33,7 @@ cat <${cwd}/tmp/bconcmds messages @$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=DDS-4 -@#setdebug level=200 client +@#setdebug level=200 client=$CLIENT label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full drive=0 label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc drive=1 diff --git a/regress/tests/tls-authenticate-test b/regress/tests/tls-authenticate-test index 38dffafc6d..10fadd2be6 100755 --- a/regress/tests/tls-authenticate-test +++ b/regress/tests/tls-authenticate-test @@ -20,7 +20,7 @@ messages @$out tmp/log1.out setdebug level=100 dir setdebug level=100 storage=File -setdebug level=100 client +setdebug level=100 client=$CLIENT status all status all messages diff --git a/regress/tests/two-volume-changer b/regress/tests/two-volume-changer index e06cf23065..e9e48d2760 100755 --- a/regress/tests/two-volume-changer +++ b/regress/tests/two-volume-changer @@ -38,7 +38,7 @@ sql select * from Storage; select VolumeName,InChanger,Slot,StorageId from Media; -@#setdebug level=1000 client +@#setdebug level=1000 client=$CLIENT @#setdebug level=250 storage=DDS-4 run job=$JobName yes wait diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test index 1266e75d76..920beb57ac 100755 --- a/regress/tests/two-volume-test +++ b/regress/tests/two-volume-test @@ -38,7 +38,7 @@ sql select * from Storage; select VolumeName,InChanger,StorageId from Media; -@#setdebug level=1000 client +@#setdebug level=1000 client=$CLIENT run job=$JobName yes wait update slots scan storage=DDS-4 diff --git a/regress/tests/virtual-changer-test b/regress/tests/virtual-changer-test index 33178f57ef..134447ebfa 100755 --- a/regress/tests/virtual-changer-test +++ b/regress/tests/virtual-changer-test @@ -33,7 +33,7 @@ cat <${cwd}/tmp/bconcmds messages @$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=Virtual -@#setdebug level=200 client +@#setdebug level=200 client=$CLIENT label storage=Virtual volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=Virtual volume=TestVolume002 slot=2 Pool=Full drive=0 label storage=Virtual volume=TestVolume003 slot=3 Pool=Inc drive=1 -- 2.39.5