updates

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

diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test
index d243c9971246ecd7356feafb78927e0182736ab4..8308251575ce651ed49d1d8cec230dc3243452ab 100755 (executable)
--- a/regress/tests/migration-job-test
+++ b/regress/tests/migration-job-test
@@ -45,6 +45,7 @@ run job=migrate-job yes
 list volumes
 wait
 messages
+purge volume=FileVolume001
 wait
 @# 
 @# now do a restore

diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test
index dc903d03024337ab26d0eeb5a73b01bc9eef8ec2..21a4a19b46de92fafff2aa50cf022d622eee8c56 100755 (executable)
--- a/regress/tests/migration-jobspan-test
+++ b/regress/tests/migration-jobspan-test
@@ -10,7 +10,7 @@
 TestName="migration-jobspan-test"
 JobName=MigrationJobSpanSave
 . scripts/functions
-set_debug 1
+set_debug 0
 
 . config.out
 

diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test
index e5c9e35f783ebe3916b96f864c452815bf6c2083..aed2298afac9837815fd3aea12d760ff98bbe219 100755 (executable)
--- a/regress/tests/migration-occupancy-test
+++ b/regress/tests/migration-occupancy-test
@@ -46,6 +46,7 @@ run job=migrate-occupancy yes
 list volumes
 wait
 messages
+purge volume=FileVolume001
 wait
 @# 
 @# now do a restore

diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test
index 0b574264c1affba103dba20ac22fef8117307e20..1adbb0e6d19102ee2935de7585875509799ee75a 100755 (executable)
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -52,6 +52,7 @@ run job=migrate-time yes
 wait
 messages
 wait
+purge volume=FileVolume001
 list jobs
 list volumes
 @# 

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index e2d66b60daa5ccf7fbbac8b303fa647e28c973b1..5927296a555a7929829e4d7870d2139a53b4f35d 100755 (executable)
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -8,7 +8,7 @@
 TestName="migration-volume-test"
 JobName=MigVolBackup
 . scripts/functions
-set_debug 0
+set_debug 0 
 
 . config.out
 
@@ -49,6 +49,8 @@ update volume=FileVolume002 VolStatus=Used
 list volumes
 @# should migrate two jobs
 @# setdebug level=11 dir
+@echo "Run migrate-volume Job"
+@#setdebug level=100 dir
 run job=migrate-volume yes
 list volumes
 @sleep 3
@@ -58,6 +60,9 @@ status storage=DiskChanger
 @sleep 1
 status storage=DiskChanger
 wait
+purge volume=FileVolume001
+purge volume=FileVolume002
+@echo "Now do a restore"
 messages
 @# 
 @# now do a restore