Fix regression tests.

Don't run two time migrations of the same jobs which leads to strange unpredictable results. Also fixed the check to look for the correct ids.
bareos · Sep 5, 2013 · 6628042 · 6628042
1 parent 41ff342
commit 6628042
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/tests/prune-copy-test b/tests/prune-copy-test
@@ -113,7 +113,7 @@ check_restore_diff
 # Copy jobs are pruned like normal jobs after the Job Retention period
 # the admin 'c'opy job should also be pruned
 # F F c c C C I0 I -> F I
-$bperl -e "check_prune_list('$tmp/log10.out',1,3,4,5,6,7)"
+$bperl -e "check_prune_list('$tmp/log10.out',1,5,6,7)"
 estat=$(($estat + $?))
 
 end_test
diff --git a/tests/prune-migration-test b/tests/prune-migration-test
@@ -46,7 +46,6 @@ wait
 list jobs
 @# should migrate two jobs
 run job=migrate-job yes
-run job=migrate-job yes
 wait
 messages
 list jobs
@@ -101,7 +100,7 @@ check_restore_diff
 # anymore. See scripts/functions.pm for details.
 
 # M M g g F F I0 -> F
-$bperl -e "check_prune_list('$tmp/log10.out',1,2,3,4,5,7)"
+$bperl -e "check_prune_list('$tmp/log10.out',1,2,5,7)"
 estat=$(($estat + $?))
 
 end_test