X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmigration-volume-test;h=dc951eaeb61c22ad3b2e397e8578b33f9bf81230;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=9c9b2d0ef485d75bf5a882a8a537ce6316e8f246;hpb=00b2e2f4e4580254fdcd9a4f746faedd2c955386;p=bacula%2Fbacula

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index 9c9b2d0ef4..dc951eaeb6 100755
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -1,21 +1,21 @@
 #!/bin/sh
 #
-# Run a simple backup of the Bacula build directory then migrate it
-#   to another device.
+# Run a backup of the Bacula build directory on two Volumes
+#   then migrate it to another device.             
 #
 # This script uses the virtual disk autochanger
 #
 TestName="migration-volume-test"
 JobName=MigVolBackup
 . scripts/functions
-set_debug 1
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
-scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+scripts/prepare-disk-changer
+echo "${cwd}/build" >${cwd}/tmp/file-list
+#cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
+#sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
 change_jobname NightlySave $JobName
 start_test
@@ -27,42 +27,61 @@ start_test
 #              Pool Full    uses Storage=DiskChanger
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
-@output
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=FileVolume001 Pool=Default
+label storage=File volume=FileVolume002 Pool=Default
+update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
-list volumes
-@# run two jobs (both will be migrated)
+@# 
 run job=$JobName yes
 wait
 run job=$JobName yes
-@sleep 1
-status storage=File       
-@sleep 1
-status storage=File
-@sleep 1
-status storage=File
 wait
 update volume=FileVolume001 VolStatus=Used
-list volumes
+update volume=FileVolume002 VolStatus=Used
+@#list volumes
+@#list jobs
 @# should migrate two jobs
+@# setdebug level=11 dir
+@echo "Run migrate-volume Job"
+@#setdebug level=100 dir
 run job=migrate-volume yes
-list volumes
-@sleep 3
-status storage=DiskChanger
-@sleep 1
-status storage=DiskChanger
-@sleep 1
+@sleep 5 
+list jobs
+llist jobid=1
+llist jobid=2
+llist jobid=3
+llist jobid=4
+llist jobid=5
 status storage=DiskChanger
 wait
+list volumes
+list jobs
+llist jobid=1
+llist jobid=2
+llist jobid=3
+llist jobid=4
+llist jobid=5
+sql
+select * from JobMedia where JobId=1;
+
+@# Now run a second Migration job, which should do nothing
+run job=migrate-volume yes
+wait
+list jobs
+@# ensure we don't pickup old backup by purging volume
+@# purge volume=FileVolume001
+@# purge volume=FileVolume002
+@echo "Now do a restore"
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
@@ -70,7 +89,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA