X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbscan-test;h=fd71ef336daed3acf591e86d3b7612470fd48767;hb=f1917472243bb52a9471b42f283c4c36d2cb1ec8;hp=98278b2e550d587d574785002becda681bbfa219;hpb=3db9cf6a2ab466b7f61a0ceddda621deb3fc5fc9;p=bacula%2Fbacula

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 98278b2e55..fd71ef336d 100755
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -5,37 +5,38 @@
 #   into the catalog after the backup. It also to a limited
 #   extent tests the purge volume and delete volume commands.
 #
-cwd=`pwd`
-scripts/copy-test-confs
+
+TestName="bscan-test"
+JobName=bscan
+. scripts/functions
+
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+scripts/copy-test-confs
+echo "${cwd}/build" >tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting bscan-test  ==="
-echo " === Starting bscan-test  ===" >working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
 
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
-@output /dev/null
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
+@$out tmp/log1.out
 label storage=File1
 TestVolume001
 label storage=File1
 TestVolume002
-update Volume=TestVolume001
-6
-3000000
-10
-@output
-run job=NightlySave storage=File1
+update Volume=TestVolume001 MaxVolBytes=3000000
+run job=$JobName storage=File1
 yes
 wait
+list volumes
+list files jobid=1
+sql
+select * from JobMedia;
+
+
 messages
+@$out /dev/null
 @#
 @# now purge the Volume
 @#
@@ -45,36 +46,44 @@ delete volume=TestVolume001
 yes
 delete volume=TestVolume002
 yes
+messages
 quit
 END_OF_DATA
-bin/bacula stop
-echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr
-bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
-@output /dev/null
+
+run_bacula
+check_for_zombie_jobs storage=File1
+stop_bacula
+
+echo "volume=TestVolume001" >tmp/bscan.bsr
+echo "volume=TestVolume002" >>tmp/bscan.bsr
+
+if test "$debug" -eq 1 ; then
+  bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp                   
+else
+  bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >tmp/log3.out
+fi
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
+@$out tmp/log2.out
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores
-5
-done
+@#setdebug level=400 storage=File1
+restore bootstrap=tmp/kern.bsr where=tmp/bacula-restores select all storage=File1 done
 yes
 wait
 messages
+@$out
 quit
 END_OF_DATA
-bin/bacula stop
-diff -r build  tmp/bacula-restores${cwd}/build
-if [ $? != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  ===== bscan-test Bacula source failed!!! ===== "
-   echo "  ===== bscan-test failed!!! ===== " >>test.out
-   echo " "
-else
-   echo "  ===== bscan-test Bacula source OK ===== "
-   echo "  ===== bscan-test OK ===== " >>test.out
-   scripts/cleanup
-fi
+
+# now run restore
+run_bacula
+check_for_zombie_jobs storage=File1
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test