Updates

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

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index bd0f6dc57634d597450767bd06216c3306432819..f190724fc35bd726ae8728a8551db4d254a3e15a 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -117,6 +117,33 @@ Job {
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
 }
 
+JobDefs {
+  Name = "BackupJob"
+  Type = Backup
+  Pool = Default
+  Storage = File
+  Messages = Standard
+  Priority = 10
+}
+
+Job {
+  JobDefs = "BackupJob"
+  Name = "bug621-job-1"
+  Client = @hostname@-fd
+  FileSet="Full Set"
+  ClientRunBeforeJob = "/bin/sleep 60"
+}
+
+Job {
+  JobDefs = "BackupJob"
+  Name = "bug621-job-2"
+  Client = @hostname@-fd
+  FileSet = "Full Set"
+  Max Run Time = 30
+  Priority = 15
+}
+
+
 # Standard Restore template, to be changed by Console program
 Job {
   Name = "RestoreFiles"

diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test
index ac5d9b5a3cfb74f46b1d1f058410adc26c3661d0..265512bc22249c9c42d2b063d79b87d05d83bf6e 100755 (executable)
--- a/regress/tests/compress-encrypt-test
+++ b/regress/tests/compress-encrypt-test
@@ -6,7 +6,7 @@
 TestName="compressed-encrypt-test"
 JobName=CompressedTest
 . scripts/functions
-set_debug 1
+set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs

diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test
index 16f4e6a5b2a3fea7ac4e9e9ddf2473201d9e9ef4..d184c9737bf64150444a9a9352ea19cf8f582c97 100755 (executable)
--- a/regress/tests/data-encrypt-test
+++ b/regress/tests/data-encrypt-test
@@ -7,7 +7,7 @@
 TestName="data-encrypt-test"
 JobName=Crypto
 . scripts/functions
-set_debug 1
+set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index ac782cab20de841c7c01120b818d62cdc25fba6f..bdcc87fcab6f56b9baba5108c4608d5604f6015d 100755 (executable)
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -38,7 +38,6 @@ label storage=File volume=FileVolume002 Pool=Default
 update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default
 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 job=$JobName yes
 wait
@@ -46,28 +45,39 @@ run job=$JobName yes
 wait
 update volume=FileVolume001 VolStatus=Used
 update volume=FileVolume002 VolStatus=Used
-list volumes
+@#list volumes
+@#list jobs
 @# 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 5 
 list jobs
-@sleep 3
-status storage=DiskChanger
-@sleep 1
-status storage=DiskChanger
-@sleep 1
+llist jobid=1
+llist jobid=2
+llist jobid=3
+llist jobid=4
+llist jobid=5
 status storage=DiskChanger
 wait
+list volumes
 list jobs
+llist jobid=1
+llist jobid=2
+llist jobid=3
+llist jobid=4
+llist jobid=5
 sql
 select * from JobMedia where JobId=1;
 
+@# Now run a second Migration job, which should do nothing
+run job=migrate-volume yes
+wait
+list jobs
 @# ensure we don't pickup old backup by purging volume
-purge volume=FileVolume001
-purge volume=FileVolume002
+@# purge volume=FileVolume001
+@# purge volume=FileVolume002
 @echo "Now do a restore"
 messages
 @#