X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmigration-job-test;h=ac0ea2b979183f8ed5b3a2e2d46cc745853a3459;hb=5dd06f639b5e883410a3af50727706a3d16e4028;hp=bb88142221f06b1b9eac2754f8fb41d8a284e4b9;hpb=f8bde815b4da2548d44340baabae882e67eac480;p=bacula%2Fbacula

diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test
index bb88142221..ac0ea2b979 100755
--- a/regress/tests/migration-job-test
+++ b/regress/tests/migration-job-test
@@ -8,14 +8,12 @@
 TestName="migration-job-test"
 JobName=MigrationJobSave
 . scripts/functions
-set_debug 0
 
-. config.out
 
+scripts/cleanup
 scripts/copy-migration-confs
 scripts/prepare-two-disks
-scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
@@ -27,33 +25,51 @@ 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
+setdebug level=100 storage=File
 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
-list volumes
 @# run two jobs (both will be migrated)
 run job=$JobName yes
 run job=$JobName yes
 wait
+list jobs
 list volumes
+@#setdebug level=100 dir
 @# should migrate two jobs
-run job=migrate yes
+@#setdebug level=51 storage=DiskChanger
+run job=migrate-job yes
+wait
+messages
+@# purge volume=FileVolume001
+list jobs 
 list volumes
 wait
+@#
+@# Now do another backup, but level Incremental
+@#
+run job=$JobName level=Incremental yes
+wait
 messages
+@#
+@# This final job that runs should be Incremental and
+@# not upgraded to full.
+list jobs
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+list volumes 
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
 done
 yes
+list volumes
 wait
 messages
 @output