From 858436b7ec2a9a67d7b323dbfb554c4de13cc992 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 15 Feb 2009 07:53:18 +0000 Subject: [PATCH] updates git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8451 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/tests/copy-volume-test | 8 ++++---- regress/tests/recycle-test | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/regress/tests/copy-volume-test b/regress/tests/copy-volume-test index 2200c90d11..d272c97cd4 100755 --- a/regress/tests/copy-volume-test +++ b/regress/tests/copy-volume-test @@ -168,22 +168,22 @@ stop_bacula get_mig_info 1 ${cwd}/tmp/log11.out -if [ -z "$RET" -o "$RET" -eq 0 ]; then +if [ -z "$RET" -o $RET -eq 0 ]; then bstat=2 print_debug "The first job must have been copied" fi get_mig_info 2 ${cwd}/tmp/log11.out -if [ -z "$RET" -o "$RET" -ne 0 ]; then +if [ -z "$RET" -o $RET -ne 0 ]; then bstat=2 - print_debug "The second job have no files, it can't have been copied" + print_debug "The second job has no files, it can't have been copied" fi JOBID=`awk -F= '/Job queued. JobId/ {if(!f){print $2; f=1;}}' ${cwd}/tmp/log4.out` get_mig_info $JOBID ${cwd}/tmp/log4.out -if [ -z "$RET" -o "$RET" -eq 0 ]; then +if [ -z "$RET" -o $RET -eq 0 ]; then bstat=2 print_debug "The new incremental job must have been copied" fi diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index 066217fbc3..701a0083e7 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -5,6 +5,11 @@ # volumes to be recycled, and cycling through the volumes # twice. Tests maxvoljobs and volretention. # +# Note, this test is a bit tricky, in that if you get too +# much data in the regress/build directory, the test will +# fail because it will run out of enough volumes to backup +# all the data. +# TestName="recycle-test" JobName=Recycle . scripts/functions -- 2.39.5