From 1d8a80a2d9753af63de42af584d7e57b832deba3 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 26 Oct 2008 17:09:22 +0000 Subject: [PATCH] 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 --- regress/tests/copy-time-test | 2 +- regress/tests/migration-time-test | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/regress/tests/copy-time-test b/regress/tests/copy-time-test index c09a369ca7..5e88cbd332 100755 --- 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 a1846e447d..4659318885 100755 --- a/regress/tests/migration-time-test +++ b/regress/tests/migration-time-test @@ -30,15 +30,17 @@ cat <${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 -- 2.39.5