Fix typo in db_password for bscan tests

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

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index f35719dd1aeed3224c9aac000571519336af4b4c..3cbcb3736292a542b6d44214766b3deba69c5af5 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -99,10 +99,10 @@ echo "volume=TestVolume001" >tmp/bscan.bsr
 bscan_libdbi
 
 # If the database has a password pass it to bscan
-if test "x${db_passwd}" = "x"; then
+if test "x${db_password}" = "x"; then
   PASSWD=
 else
-  PASSWD="-P ${db_passwd}"
+  PASSWD="-P ${db_password}"
 fi
 
 if test "$debug" -eq 1 ; then

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 89f5fc1471ec2e760b1766a095c2bbdfc8354d88..92f8ec6229eeab6c350c88fa8f009f140c8615fb 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -60,10 +60,10 @@ echo "volume=TestVolume002" >>tmp/bscan.bsr
 bscan_libdbi
 
 # If the database has a password pass it to bscan
-if test "x${db_passwd}" = "x"; then
+if test "x${db_password}" = "x"; then
   PASSWD=
 else
-  PASSWD="-P ${db_passwd}"
+  PASSWD="-P ${db_password}"
 fi
 
 if test "$debug" -eq 1 ; then

diff --git a/regress/tests/plugin-test b/regress/tests/plugin-test
index 98878267808e824734983fedbce89bff0dde2538..b54636420afd976b254b25b68c8e8ab3e85ff5a6 100755 (executable)
--- a/regress/tests/plugin-test
+++ b/regress/tests/plugin-test
@@ -19,7 +19,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 label storage=File1 volume=TestVolume001
-setdebug level=50 client=$CLIENT
+@#setdebug level=50 client=$CLIENT
 run job=$JobName storage=File1 yes
 wait
 messages
@@ -27,7 +27,7 @@ quit
 END_OF_DATA
 
 
-run_bacula -d50
+run_bacula
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
@@ -35,10 +35,11 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-@#setdebug level=50 client=$CLIENT
+setdebug level=50 client=$CLIENT
 restore where=${cwd}/tmp  select all storage=File1 done
 yes
 wait
+setdebug level=0 client=$CLIENT
 messages
 @$out
 quit

diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape
index b1c9fc6c8558b69dedf3fa85e9f12ee9d638cdb6..c1a12d481e9792115d44c68372ae0a03924262d9 100755 (executable)
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -22,6 +22,8 @@ messages
 @$out   tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 @# do a bunch of saves so we have 12 files on the tape
+@#setdebug level=100 dir
+setdebug level=100 storage=DDS-4
 run job=$JobName yes
 run level=Full job=$JobName yes
 run level=Full job=$JobName yes
@@ -34,7 +36,6 @@ run level=Full job=$JobName yes
 run level=Full job=$JobName yes
 run level=Full job=$JobName yes
 run level=Full job=$JobName yes
-@#setdebug level=100 storage=DDS-4
 wait
 messages
 quit