Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7480 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/all-disk-tests b/regress/all-disk-tests
index 0ddfcae1ba59c3e044d83bc06fdb581d89b2135e..9355fd676e4f9cad8caf423ba0bdd69596ae9e2f 100755 (executable)
--- a/regress/all-disk-tests
+++ b/regress/all-disk-tests
@@ -56,6 +56,8 @@ nice tests/migration-volume-test
 nice tests/migration-time-test
 nice tests/hardlink-test
 nice tests/tls-test
+nice tests/virtual-changer-test
+nice tests/virtual-backup-test
 echo "End non-root disk tests"
 echo "End non-root disk tests" >>test.out
 

diff --git a/regress/tests/virtual-backup-test b/regress/tests/virtual-backup-test
index d9872a0d639e5b9d4e3fc3d9e3d2e43f740df488..1ff14eac499f2b47febebae62c5f97b3cd994a71 100755 (executable)
--- a/regress/tests/virtual-backup-test
+++ b/regress/tests/virtual-backup-test
@@ -54,8 +54,18 @@ wait
 messages
 list jobs
 list volumes
-setdebug level=100 dir
-@# should migrate two jobs
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out
+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
@@ -71,9 +81,40 @@ 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
+run job=$JobName level=VirtualFull yes
 wait
 messages
+list volumes
+list jobs
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out
+setdebug level=0 storage=DiskChanger
+restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
+unmark *
+mark *
+done
+yes
+wait
+list volumes
+list jobs
+messages
 @output
 quit
 END_OF_DATA