X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmigration-jobspan-test;h=b0024a1fc2de32987831b4cf9fef459f2dcca398;hb=d31853cb561b4c9bc779cdc071d904d887a3393c;hp=838cb00b283708c1011b6c75a38785e1303ea639;hpb=a3cb94dc3a91801268caee79a8bcccf2c834802d;p=bacula%2Fbacula

diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test
index 838cb00b28..b0024a1fc2 100755
--- a/regress/tests/migration-jobspan-test
+++ b/regress/tests/migration-jobspan-test
@@ -10,14 +10,12 @@
 TestName="migration-jobspan-test"
 JobName=MigrationJobSpanSave
 . scripts/functions
-set_debug 0
 
-. 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
 
@@ -32,11 +30,11 @@ 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
-@#setdebug level=100 dir
+@$out ${cwd}/tmp/log1.out
+@#setdebug level=10 dir
 @#setdebug level=100 storage=File
 label storage=File volume=FileVolume001 Pool=Default
 label storage=File volume=FileVolume002 Pool=Default
@@ -49,9 +47,12 @@ run job=$JobName yes
 @#run job=$JobName yes
 wait
 list volumes
+@#setdebug level=200 dir
 @# should migrate both Volumes
 run job=migrate-job yes
 wait
+purge volume=FileVolume001
+purge volume=FileVolume002
 list volumes
 list jobs
 messages
@@ -59,7 +60,8 @@ wait
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+setdebug level=500 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
@@ -67,7 +69,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA