From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 1 Jul 2009 18:45:45 +0000 (+0000)
Subject: Fix regress tests to handle new default job name
X-Git-Tag: Release-3.0.2~132
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f692a5242e7505d2c7a782823387781f37f5589;p=bacula%2Fbacula

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 80168c8b4b..0f57a4bf35 100755
--- 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 0b5eb4b71c..b9da95c554 100755
--- 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 8cf65cf560..25d2e76d49 100755
--- 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 87c9486336..578b2d59e5 100755
--- 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 dbc50424af..11e8f141aa 100755
--- 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 dfcaa6631d..3e7a9d44c0 100755
--- 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 b0609d5461..4ee94cf86f 100755
--- 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