From: <ke...@us...> - 2008-08-30 16:40:19
|
Revision: 7529 http://bacula.svn.sourceforge.net/bacula/?rev=7529&view=rev Author: kerns Date: 2008-08-30 16:40:28 +0000 (Sat, 30 Aug 2008) Log Message: ----------- Check Restore Error status + fix virtual-backup-test script Modified Paths: -------------- trunk/regress/scripts/functions trunk/regress/tests/virtual-backup-test Modified: trunk/regress/scripts/functions =================================================================== --- trunk/regress/scripts/functions 2008-08-30 12:42:58 UTC (rev 7528) +++ trunk/regress/scripts/functions 2008-08-30 16:40:28 UTC (rev 7529) @@ -194,14 +194,18 @@ fi grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null rstat=$? - grep "^ Termination: *Restore OK -- warning file count mismatch" tmp/log2.out 2>&1 >/dev/null + grep "^ Termination: .*Restore Error" tmp/log2.out 2>&1 >/dev/null if test $? -eq 0; then rstat=2 fi - grep "^ Termination: .*Verify Differences" tmp/log2.out 2>&1 >/dev/null + grep "^ Termination: *Restore OK -- warning file count mismatch" tmp/log2.out 2>&1 >/dev/null if test $? -eq 0; then rstat=3 fi + grep "^ Termination: .*Verify Differences" tmp/log2.out 2>&1 >/dev/null + if test $? -eq 0; then + rstat=4 + fi } check_restore_diff() Modified: trunk/regress/tests/virtual-backup-test =================================================================== --- trunk/regress/tests/virtual-backup-test 2008-08-30 12:42:58 UTC (rev 7528) +++ trunk/regress/tests/virtual-backup-test 2008-08-30 16:40:28 UTC (rev 7529) @@ -59,7 +59,6 @@ @# @# now do a normal restore of normal backups @# -@$out ${cwd}/tmp/log2.out setdebug level=10 dir restore where=${cwd}/tmp/bacula-restores select unmark * @@ -78,7 +77,6 @@ @# @# now do a restore of the consolidated Full @# -@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger unmark * mark * @@ -96,6 +94,11 @@ check_for_zombie_jobs storage=File stop_bacula +# +# We only used one log so copy it to the second log +# so that any restore errors will be picked up +# +cp -f ${cwd}/tmp/log1.out ${cwd}/tmp/log2.out check_two_logs check_restore_diff end_test This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |