X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmigration-volume-test;h=2d5e57885c68095b7429a7196410965fa96bc514;hb=86e786f4fb2faf7c9487a0bf4633371cbb57b759;hp=ac782cab20de841c7c01120b818d62cdc25fba6f;hpb=5b3eb90d679c9c5006f9ed3b2ebe9dab0baa4f64;p=bacula%2Fbacula

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index ac782cab20..2d5e57885c 100755
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -8,14 +8,12 @@
 TestName="migration-volume-test"
 JobName=MigVolBackup
 . scripts/functions
-set_debug 0 
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
 scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+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
 
@@ -29,16 +27,15 @@ start_test
 #              Pool Full    uses Storage=DiskChanger
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output
 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 job=$JobName yes
 wait
@@ -46,34 +43,45 @@ run job=$JobName yes
 wait
 update volume=FileVolume001 VolStatus=Used
 update volume=FileVolume002 VolStatus=Used
-list volumes
+@#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 5 
 list jobs
-@sleep 3
-status storage=DiskChanger
-@sleep 1
-status storage=DiskChanger
-@sleep 1
+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
+@# 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 *
@@ -89,8 +97,6 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
-exit
-
 check_two_logs
 check_restore_diff
 end_test