Update

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index cf8213d84b63bd9ed31d53400d3187032e9eb373..8eff3fde0e5ddc4236dd13e6cf7cd74c0f1f0eeb 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -30,6 +30,8 @@ tests/two-vol-test
 tests/verify-vol-test
 tests/weird-files2-test
 tests/weird-files-test
+tests/migration-job-test
+tests/migration-volume-test
 # 
 # The following are Virtual Disk Autochanger tests
 tests/two-pool-test

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index b44c59f0349824f8921315124a8bbf2554c212e2..dbc5b7b9f042ba484e7742198e18d3a028e94a3e 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -10,7 +10,8 @@ rm -rf /tmp/sed_tmp /tmp/file-list
 rm -rf tmp/build tmp/restore-list tmp/restore2-list
 rm -rf tmp/fd.out tmp/dir.out tmp/sd.out
 rm -rf working/log tmp/TEST-*
-rm -rf working/*restore*.bsr
+rm -rf working/*.bsr
+rm -rf tmp/disk-changer /tmp/disk-changer
 
 bin/bacula stop 2>&1 >/dev/null
 cd bin

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

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index 81d7a339e577fee1bf7c9c1a7e087dea052f6cc6..9aa0b5e5e483151b2d6531c50f02cc7f10798150 100755 (executable)
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -6,7 +6,7 @@
 # This script uses the virtual disk autochanger
 #
 TestName="migration-volume-test"
-JobName=MigrationVolSave
+JobName=MigVolBackup
 . scripts/functions
 set_debug 1
 
@@ -37,13 +37,26 @@ label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
 list volumes
 @# run two jobs (both will be migrated)
 run job=$JobName yes
+wait
 run job=$JobName yes
+@sleep 1
+status storage=File       
+@sleep 1
+status storage=File
+@sleep 1
+status storage=File
 wait
 update volume=FileVolume001 VolStatus=Used
 list volumes
 @# should migrate two jobs
 run job=migrate-volume yes
 list volumes
+@sleep 3
+status storage=DiskChanger
+@sleep 1
+status storage=DiskChanger
+@sleep 1
+status storage=DiskChanger
 wait
 messages
 @# 
@@ -67,5 +80,4 @@ stop_bacula
 
 check_two_logs
 check_restore_diff
-exit
 end_test

diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index f46e4c83a722fa0f6ed153cfae6c3a4d3d0f8faa..e7976181e1c687ee9d8da4ba44bc655381aa8adb 100755 (executable)
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -78,4 +78,3 @@ stop_bacula
 check_two_logs
 check_restore_diff
 end_test
-

diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index 68b4feb3f5d5d8b237695953c77a3dc826cba9d1..484fd958f14e861037fc647536a57d1a4e918a69 100755 (executable)
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -10,12 +10,9 @@
 TestName="two-volume-test"
 JobName=TwoVolume
 . scripts/functions
-set_debug 0
+set_debug 1
 . config.out
-if test x${AUTOCHANGER} = x/dev/null ; then
-   echo "two-volume-test skipped. No autochanger."
-   exit
-fi
+
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs