Update

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

diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test
index 04064f6a95a00756d487b70626820f84b3b97126..d2c12ce6c72b5442a86b7d0b0559707cc626c4ac 100755 (executable)
--- a/regress/tests/data-encrypt-test
+++ b/regress/tests/data-encrypt-test
@@ -10,7 +10,7 @@ set_debug 1
 
 scripts/cleanup
 scripts/copy-crypto-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build/po/LINGUAS" >/tmp/file-list
 
 start_test
 
@@ -19,6 +19,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
+setdebug level=300 fd
 run job=$JobName yes
 wait
 messages
@@ -26,7 +27,7 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
-@#setdebug level=50 storage=File
+setdebug level=0 fd
 restore where=${cwd}/tmp/bacula-restores storage=File
 5
 mark *

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index 5927296a555a7929829e4d7870d2139a53b4f35d..3e54ad098bfbd8c187153dec961955f25b0ed249 100755 (executable)
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -53,6 +53,7 @@ list volumes
 @#setdebug level=100 dir
 run job=migrate-volume yes
 list volumes
+list jobs
 @sleep 3
 status storage=DiskChanger
 @sleep 1
@@ -60,6 +61,11 @@ status storage=DiskChanger
 @sleep 1
 status storage=DiskChanger
 wait
+list jobs
+sql
+select * from JobMedia where JobId=1;
+
+@# ensure we don't pickup old backup by purging volume
 purge volume=FileVolume001
 purge volume=FileVolume002
 @echo "Now do a restore"