ebl Add more tests in migration time test (like for copy time test)

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7912 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/copy-time-test b/regress/tests/copy-time-test
index c09a369ca7902a3110658af3ae4230c21138b00c..5e88cbd332138806288d806d74746142d829efec 100755 (executable)
--- a/regress/tests/copy-time-test
+++ b/regress/tests/copy-time-test
@@ -82,7 +82,7 @@ for i in 1 2 3; do
 
     if [ "$i" -eq 1 -a -n "$RET" ]; then
         bstat=2
-        print_debug "The first job should not been copied"
+        print_debug "The first job should not have been copied"
 
     elif [ "$i" -ne 1 -a -z "$RET" ]; then
         bstat=2

diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test
index a1846e447deca2c71f1eccfc9caf328b519e8a95..465931888519870574312c450cc9492f098d2f04 100755 (executable)
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -30,15 +30,17 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$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
+update volume=FileVolume002 VolStatus=Used
 llist jobid=2,3
 list jobs
 list volumes
@@ -50,7 +52,6 @@ messages
 wait
 list jobs
 list volumes
-purge volume=FileVolume001
 @# 
 @# now do a restore
 @#
@@ -70,6 +71,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