X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Faccurate-test;h=80168c8b4be86f47fe11df7b2c93e10b66d80fb3;hb=38b243eb09f97315282dd31dd4f162fcbb6c6778;hp=0d84e9ad45e0b9e15ff3fa08ed69b0c8c23480a5;hpb=753fd906651653f03bf1f4f11ac0437d22210867;p=bacula%2Fbacula

diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test
index 0d84e9ad45..80168c8b4b 100755
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -7,6 +7,7 @@
 # Run a accurate backup of the Bacula build directory
 #   then restore it.
 #
+
 TestName="accurate-test"
 JobName=backup
 . scripts/functions
@@ -14,10 +15,18 @@ scripts/cleanup
 
 copy_test_confs
 /bin/cp -f scripts/bacula-dir.conf.accurate bin/bacula-dir.conf
-sed -i s/all,/all,saved,/ bin/bacula-fd.conf
+sed s/all,/all,saved,/ bin/bacula-fd.conf > tmp/1
+cp tmp/1 bin/bacula-fd.conf
 
 change_jobname Client1 $JobName
 
+p() {
+    echo "##############################################" >> ${cwd}/tmp/log1.out
+    echo "$*" >> ${cwd}/tmp/log1.out
+    echo "##############################################" >> ${cwd}/tmp/log2.out
+    echo "$*" >> ${cwd}/tmp/log2.out
+}
+
 # cleanup
 rm -rf ${cwd}/build/accurate.new
 rm -rf ${cwd}/build/accurate
@@ -25,6 +34,8 @@ rm -rf ${cwd}/build/accurate
 
 # add extra files
 mkdir ${cwd}/build/accurate
+mkdir ${cwd}/build/accurate/dirtest
+echo "test test" > ${cwd}/build/accurate/dirtest/hello
 echo "test test" > ${cwd}/build/accurate/xxx
 echo "test test" > ${cwd}/build/accurate/yyy
 echo "test test" > ${cwd}/build/accurate/zzz
@@ -56,6 +67,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out  
+setdebug level=10 storage=File
 restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -65,7 +77,7 @@ quit
 END_OF_DATA
 
 ################################################################
-# First :  We just run full and restore to compare if all is ok
+p First :  We just run full and restore to compare if all is ok
 ################################################################
 
 run_bconsole
@@ -77,33 +89,37 @@ check_restore_diff
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do a second backup after making few changes
+p Now do a second backup after making few changes
 ################################################################
 rm ${cwd}/build/accurate/xxx  # delete a file
+rm ${cwd}/build/accurate/dirtest/hello
 
 run_bconsole
 check_for_zombie_jobs storage=File
 
 check_two_logs
 check_restore_diff
+check_files_written ${cwd}/tmp/log1.out 4
 
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do a third backup after making few changes
+p Now do a third backup after making few changes
 ################################################################
 rm ${cwd}/build/accurate/yyyyyy  # delete a file
+rmdir ${cwd}/build/accurate/dirtest
 
 run_bconsole
 check_for_zombie_jobs storage=File
 
 check_two_logs
 check_restore_diff
+check_files_written ${cwd}/tmp/log1.out 3
 
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do a 4 backup after making few changes
+p Now do a 4 backup after making few changes
 ################################################################
 rm ${cwd}/build/accurate/zzzzzz  # delete a file
 
@@ -112,11 +128,12 @@ check_for_zombie_jobs storage=File
 
 check_two_logs
 check_restore_diff
+check_files_written ${cwd}/tmp/log1.out 2
 
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do a 5 backup after making few changes
+p Now do a 5 backup after making few changes
 ################################################################
 rm ${cwd}/build/accurate/zzzzzzzzz
 
@@ -125,11 +142,12 @@ check_for_zombie_jobs storage=File
 
 check_two_logs
 check_restore_diff
+check_files_written ${cwd}/tmp/log1.out 2
 
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do a backup after making few changes
+p Now do a backup after making few changes
 ################################################################
 touch ${cwd}/build/accurate/aaaaaa
 
@@ -138,21 +156,22 @@ check_for_zombie_jobs storage=File
 
 check_two_logs
 check_restore_diff
+check_files_written ${cwd}/tmp/log1.out 2
 
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Check with bls
+p Check with bls
 ################################################################
 
-${cwd}/bin/bls -c ${cwd}/bin/bacula-sd.conf -V 'TestVolume001' FileStorage > tmp/bls.out
+$bin/bls -c bin/bacula-sd.conf -V 'TestVolume001' FileStorage > tmp/bls.out
 grep -- '----' tmp/bls.out | grep xxx > /dev/null
 if [ $? != 0 ] ; then
     bstat=2
 fi
 
 ################################################################
-# Now do a backup after making few changes
+p Now do a backup after making few changes
 ################################################################
 
 # some files will have disappear, others have their old mtime/ctime
@@ -167,7 +186,7 @@ check_restore_diff
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do an other test in differential mode
+p Now do an other test in differential mode
 ################################################################
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
@@ -179,6 +198,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out  
+setdebug level=10 storage=File
 restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -196,7 +216,7 @@ check_restore_diff
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do an other test in differential mode + incremental
+p Now do an other test in differential mode + incremental
 ################################################################
 
 # make some changes
@@ -211,6 +231,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out  
+setdebug level=10 storage=File
 restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -228,19 +249,20 @@ check_restore_diff
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do a backup after making few changes
+p Now do a backup after making few changes
 ################################################################
 rm ${cwd}/build/accurate/aaaaaa
 touch ${cwd}/build/accurate/bbbbbb
 
 run_bconsole
 check_for_zombie_jobs storage=File
+check_files_written ${cwd}/tmp/log1.out 3
 
 check_two_logs
 check_restore_diff
 
 ################################################################
-# Now do a backup after making few changes
+p Now do a backup after making few changes
 ################################################################
 mv ${cwd}/tmp/bacula-restores ${cwd}/build/accurate/
 
@@ -253,7 +275,7 @@ check_restore_diff
 rm -rf ${cwd}/tmp/bacula-restores ${cwd}/build/accurate/bacula-restores
 
 ################################################################
-# Check with bscan
+p Check with bscan
 ################################################################
 
 stop_bacula
@@ -266,15 +288,18 @@ cd ..
 
 echo "volume=TestVolume001" >tmp/bscan.bsr
 
-${cwd}/bin/bscan -c ${cwd}/bin/bacula-sd.conf -n regress -u regress -m -s -b tmp/bscan.bsr FileStorage 2>&1 > ${cwd}/tmp/bscan.log
+bscan_libdbi
+
+$bin/bscan -c bin/bacula-sd.conf $BSCANLIBDBI -n regress -u regress -m -s -b tmp/bscan.bsr FileStorage 2>&1 > ${cwd}/tmp/bscan.log
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
 messages
 @# 
-@# now do a restore
+@# now do a restore after bscan
 @#
 @$out ${cwd}/tmp/log2.out  
+setdebug level=10 storage=File
 restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -294,7 +319,7 @@ check_restore_diff
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Now do a test with other attributes (owner, gid, rights)
+p Now do a test with other attributes: owner, gid, rights
 ################################################################
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
@@ -307,6 +332,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out  
+setdebug level=10 storage=File
 restore fileset=FS_TESTJOB_ADVANCE where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -325,7 +351,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 
 
 ################################################################
-# Use the p option for verify
+p Use the p option for verify
 ################################################################
 
 chmod 400 ${cwd}/build/accurate/yyy
@@ -339,6 +365,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out  
+setdebug level=10 storage=File
 restore fileset=FS_TESTJOB_ADVANCE where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -352,16 +379,17 @@ check_for_zombie_jobs storage=File
 
 check_two_logs
 check_restore_diff
+check_files_written ${cwd}/tmp/log1.out 1
 
 rm -rf ${cwd}/tmp/bacula-restores
 
 ################################################################
-# Test strippath option
+p Test strippath option
 ################################################################
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
-setdebug  level=1 client
+setdebug  level=1 client=$CLIENT
 run job=backup fileset=FS_TESTJOB2 yes
 wait
 messages
@@ -390,7 +418,7 @@ run_bconsole
 
 grep yyy ${cwd}/tmp/log3.out > /dev/null
 if [ $? != 0 ] ; then
-    print_debug "Can't find xxx file into 'list files' output (${cwd}/tmp/log3.out)"
+    print_debug "Can't find yyy file into 'list files' output (${cwd}/tmp/log3.out)"
     dstat=2
 fi
 
@@ -402,4 +430,3 @@ fi
 
 stop_bacula
 end_test
-