regress: more work on remote-fd test

[bacula/bacula] / regress / tests / verify-voltocat-test

diff --git a/regress/tests/verify-voltocat-test b/regress/tests/verify-voltocat-test
index 28f69d1ad49fb6ef3bc992a4806299d4a9b03f00..206c65f5e4cf5c3b8a3bb82499b2d52a9bfe3eca 100755 (executable)
--- a/regress/tests/verify-voltocat-test
+++ b/regress/tests/verify-voltocat-test
@@ -2,16 +2,6 @@
 #
 # Run a simple backup of the Bacula build directory
 #   then verify the Volume to the catalog.           
-# This test should not be in the normal tests run since it
-#   requires creating a mount point.
-#
-# To run this test
-#    cd regress
-#    mkdir xx
-#    mkdir xx/boot
-#    mount -t ext3 /dev/sda1 xx/boot
-#      (where /dev/sda1 is your boot partion, or some other small partition)
-#    cp regress/* xx
 #
 TestName="verify-voltocat-test"
 JobName=VerifyVol
@@ -20,8 +10,7 @@ JobName=VerifyVol
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/xx" >${cwd}/tmp/file-list
-echo "${cwd}/xx/boot" >>${cwd}/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
@@ -29,10 +18,14 @@ start_test
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out tmp/log0.out
 setdebug level=1 storage=File sd
-label storage=File volume=TestVolume001 pool=Default
-run job=$JobName yes
+label storage=File volume=TestVolume001
+run level=full job=$JobName yes
+wait
+messages
+@$out tmp/log1.out
+run level=full job=$JobName yes
 wait
 messages
 @# 
@@ -44,7 +37,22 @@ run job=VerifyVolume level=VolumeToCatalog
 yes
 wait
 messages
-@$out
+@$out ${cwd}/tmp/log4.out
+setdebug level=12 dir
+run job=VerifyVolume jobid=1 level=VolumeToCatalog
+yes
+wait
+messages
+@$out ${cwd}/tmp/log3.out
+@#
+@# Now a backup with nothing changed
+run job=$JobName level=Incremental yes
+wait
+messages
+run job=VerifyVolume level=VolumeToCatalog
+yes
+wait
+messages
 quit
 END_OF_DATA
 
@@ -58,5 +66,13 @@ grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^  Termination: *Verify OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-dstat=0
+grep "^  Termination: *Verify OK" tmp/log3.out 2>&1 >/dev/null
+dstat=$?
+grep "Verify JobId: *2" tmp/log2.out 2>&1 >/dev/null
+dstat=$(($dstat + $?))
+grep "Verify JobId: *1" tmp/log4.out 2>&1 >/dev/null
+dstat=$(($dstat + $?))
+grep "Verify Job: *VerifyVol" tmp/log4.out 2>&1 >/dev/null
+dstat=$(($dstat + $?))
+
 end_test