X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmigration-time-test;h=c88613390071b2c99b54d8cf7a4c2b58c28f5585;hb=ccb41474b231924fa189d67b4aac90f5f2a2899d;hp=3e744d4eb92d873d1909664a11de50798ef88452;hpb=ad9c22c1a00f79e4bbea8e61b5d3f2208c43bcc6;p=bacula%2Fbacula

diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test
index 3e744d4eb9..c886133900 100755
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -12,8 +12,8 @@ JobName=MigrationJobSave
 
 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
@@ -25,38 +25,38 @@ 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=Special
 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 three jobs
-run job=$JobName level=Full yes
+run job=$JobName pool=Special level=Full yes
 run job=$JobName level=Full yes
 run job=$JobName level=Full yes
 wait
 update volume=FileVolume001 VolStatus=Used
-sql
-update Job SET RealEndTime='2004-01-01 12:01:01' WHERE JobId IN (2,3);
-
+update volume=FileVolume002 VolStatus=Used
+@sleep 3
 llist jobid=2,3
 list jobs
 list volumes
+@#setdebug level=20 dir
 @# should migrate only jobid=2 and 3
 run job=migrate-time yes
 wait
 messages
 wait
-purge volume=FileVolume001
 list jobs
 list volumes
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
@@ -72,6 +72,19 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
+for i in 1 2 3; do
+    get_mig_info $i ${cwd}/tmp/log1.out
+
+    if [ "$i" -eq 1 -a -n "$RET" ]; then
+        bstat=2
+        print_debug "The first job should not have been copied"
+
+    elif [ "$i" -ne 1 -a -z "$RET" ]; then
+        bstat=2
+        print_debug "Other job should have been copied"
+    fi
+done
+
 check_two_logs
 check_restore_diff
 end_test