From e83a1773aa936f052d28358be5cfbab12cbadf9f Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Thu, 17 Jun 2010 10:03:42 +0200 Subject: [PATCH] regress: update prune-base-job-test --- regress/tests/prune-base-job-test | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/regress/tests/prune-base-job-test b/regress/tests/prune-base-job-test index 5c1d71ee07..46748ded7d 100755 --- a/regress/tests/prune-base-job-test +++ b/regress/tests/prune-base-job-test @@ -20,8 +20,8 @@ cp tmp/1 $conf/bacula-fd.conf change_jobname BackupClient1 $JobName dircfg=$conf/bacula-dir.conf -$bperl -e 'add_attribute("$dircfg", "AutoPrune", "No", "Client")' -$bperl -e 'add_attribute("$dircfg", "Job Retention", "1s", "Client")' +$bperl -e "add_attribute('$dircfg', 'AutoPrune', 'No', 'Client')" +$bperl -e "add_attribute('$dircfg', 'Job Retention', '1s', 'Client')" p() { echo "##############################################" >> ${cwd}/tmp/log1.out @@ -58,7 +58,7 @@ END_OF_DATA run_bconsole -echo ${cwd}/build > ${cwd}/tmp/file-list +echo ${cwd}/build >> ${cwd}/tmp/file-list cat <${cwd}/tmp/bconcmds @$out $tmp/log4.out @@ -70,6 +70,13 @@ messages run job=backup level=incremental yes wait messages +run job=backup level=differential yes +wait +messages +@# should be empty +run job=backup level=incremental yes +wait +messages @$out $tmp/log2.out @# @# now do a restore @@ -101,13 +108,14 @@ sql SELECT count(*) FROM BaseFiles; list jobs -@#setdebug level=60 director trace=1 -@#prune jobs yes +prune jobs yes list jobs END_OF_DATA run_bconsole -$bperl -e "check_job_list('$tmp/log10.out', 4)" +$bperl -e "check_job_list('$tmp/log10.out', 3,5,6)" +estat=$(($estat + $?)) + stop_bacula end_test -- 2.39.5