From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 1 Dec 2006 20:34:52 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-2.0.0~186
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=be9a3bacba16280c6f8349af72ba42e7cac3cfa8;p=bacula%2Fbacula

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 04064f6a95..d2c12ce6c7 100755
--- 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 5927296a55..3e54ad098b 100755
--- 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"