Fix regress tests to handle new default job name

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

diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test
index 80168c8b4be86f47fe11df7b2c93e10b66d80fb3..0f57a4bf35d1a669ff08b7e33262857b3036abca 100755 (executable)
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -18,7 +18,7 @@ copy_test_confs
 sed s/all,/all,saved,/ bin/bacula-fd.conf > tmp/1
 cp tmp/1 bin/bacula-fd.conf
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 
 p() {
     echo "##############################################" >> ${cwd}/tmp/log1.out

diff --git a/regress/tests/backup-acl-test b/regress/tests/backup-acl-test
index 0b5eb4b71ca969fba3272bb618d27e1e232b2b15..b9da95c554bf1e401018b5f6e2ac3f9f1ddf0cb6 100755 (executable)
--- a/regress/tests/backup-acl-test
+++ b/regress/tests/backup-acl-test
@@ -49,7 +49,7 @@ setfattr -n bacula.test -v rulez $d/other
   getfattr -R acl > $cwd/tmp/attr.org
 )
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 8cf65cf560e0a131a9319987aac548da629da633..25d2e76d498101254e9653bb8d5ed99805fa04be 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -19,7 +19,7 @@ echo "s%  Schedule =%# Schedule =%g" >${outf}
 cp $scripts/bacula-dir.conf $tmp/1
 sed -f ${outf} $tmp/1 >$scripts/bacula-dir.conf
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >$tmp/bconcmds

diff --git a/regress/tests/cancel-test b/regress/tests/cancel-test
index 87c9486336cc00298b8c05d92e48b04748b2cbaf..578b2d59e546d387458f8dc169ee8ff51f4ba822 100755 (executable)
--- a/regress/tests/cancel-test
+++ b/regress/tests/cancel-test
@@ -68,7 +68,7 @@ Job {
 }
 EOF
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 start_test
 
 when=`perl -MPOSIX -e "print strftime('%F %T', localtime(time+6000))"`

diff --git a/regress/tests/fileregexp-test b/regress/tests/fileregexp-test
index dbc50424af42680c615da6344c4ae4e14f86cf33..11e8f141aabc7888e843ad2ae1163a67a9f0bc38 100755 (executable)
--- a/regress/tests/fileregexp-test
+++ b/regress/tests/fileregexp-test
@@ -20,7 +20,7 @@ echo "s%File Retention =%File Retention = 2 #%" >>  ${outf}
 cp ${scripts}/bacula-dir.conf ${tmp}/1
 sed -f ${outf} ${tmp}/1 >${scripts}/bacula-dir.conf
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${tmp}/bconcmds

diff --git a/regress/tests/source-addr-test b/regress/tests/source-addr-test
index dfcaa6631dcd250812f109645a17a77d38714a97..3e7a9d44c054cd4ea6c79eacae0c0420e09463a1 100755 (executable)
--- a/regress/tests/source-addr-test
+++ b/regress/tests/source-addr-test
@@ -53,7 +53,7 @@ DIRPORT=$BASEPORT
 FDPORT=$(($BASEPORT + 1))
 SDPORT=$(($BASEPORT + 2))
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds

diff --git a/regress/tests/stats-test b/regress/tests/stats-test
index b0609d5461984979582be2860406f9b9e93a35e2..4ee94cf86f1962bd43a5b885a2965f54a777643d 100755 (executable)
--- a/regress/tests/stats-test
+++ b/regress/tests/stats-test
@@ -19,7 +19,7 @@ echo "s% DIRport%Statistics Retention = 1 sec; DIRport%g" >> $outf
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds