regress: tweak restart base job

[bacula/bacula] / regress / tests / migration-occupancy-test

diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test
index e5c9e35f783ebe3916b96f864c452815bf6c2083..fa2b53011a0faca60025eddbde74a81a42791916 100755 (executable)
--- a/regress/tests/migration-occupancy-test
+++ b/regress/tests/migration-occupancy-test
@@ -8,14 +8,12 @@
 TestName="migration-occupancy-test"
 JobName=MigrationJobSave
 . 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
 
 change_jobname NightlySave $JobName
 start_test
@@ -27,10 +25,10 @@ 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=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
@@ -46,11 +44,12 @@ run job=migrate-occupancy yes
 list volumes
 wait
 messages
+purge volume=FileVolume001
 wait
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
@@ -58,7 +57,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA