X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fvirtual-backup-test;h=800ab152c1637240f549a092cca56d23173048cd;hb=e0de4566ae440254fbe97de0eb04393fd3352d63;hp=1ff14eac499f2b47febebae62c5f97b3cd994a71;hpb=8c1ac022ed6a8be42fb097a144aa938e40af2f15;p=bacula%2Fbacula

diff --git a/regress/tests/virtual-backup-test b/regress/tests/virtual-backup-test
index 1ff14eac49..800ab152c1 100755
--- a/regress/tests/virtual-backup-test
+++ b/regress/tests/virtual-backup-test
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Run a simple backup of the Bacula build directory then do a virtual
-#   backup to another device.
+# Run a simple backup of the Bacula build directory then do a 
+#   Virtual Full backup to another device.
 #
-# This script uses the virtual disk autochanger
+# This script uses the disk autochanger
 #
 TestName="virtual-backup-test"
 JobName=Vbackup
@@ -12,7 +12,7 @@ JobName=Vbackup
 
 scripts/cleanup
 scripts/copy-migration-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
@@ -26,7 +26,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=100 storage=File
@@ -34,6 +34,7 @@ label storage=File volume=FileVolume001 Pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
 @# run several jobs
+@exec "sh -c 'date > ${cwd}/build/date'"
 run job=$JobName level=Full yes
 wait
 messages
@@ -48,6 +49,7 @@ run job=$JobName level=Differential yes
 wait
 messages
 list jobs
+@exec "sh -c 'date > ${cwd}/build/date'"
 @exec "sh -c 'touch ${cwd}/build/src/dird/*.o'"
 run job=$JobName level=Incremental yes
 wait
@@ -55,57 +57,26 @@ messages
 list jobs
 list volumes
 @# 
-@# now do a restore
+@# 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 *
 mark *
 done
 yes
 list volumes
-@#setdebug level=100 dir
 @# should Consolidate Full, Differential and Incremental
-@#setdebug level=51 storage=DiskChanger
-run job=$JobName level=VirtualFull yes
-wait
-messages
-list volumes
-list jobs
-@# 
-@# now do a restore
-@#
-@$out ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
-unmark *
-mark *
-done
-yes
-wait
-update Volume=ChangerVolume002
-11
-Default
-list volumes
-list jobs
-messages
-@exec "sh -c 'touch ${cwd}/build/src/dird/*.o'"
-run job=$JobName level=Incremental yes
-wait
-messages
-list jobs
-list volumes
-@# Now do another Consolidation
 setdebug level=150 storage=DiskChanger
+setdebug level=100 dir
 run job=$JobName level=VirtualFull yes
 wait
 messages
 list volumes
 list jobs
 @# 
-@# now do a restore
+@# now do a restore of the consolidated Full
 @#
-@$out ${cwd}/tmp/log2.out
-setdebug level=0 storage=DiskChanger
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
@@ -115,7 +86,6 @@ wait
 list volumes
 list jobs
 messages
-@output
 quit
 END_OF_DATA
 
@@ -123,6 +93,11 @@ run_bacula
 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