Give virtual-changer-test a poll interval so it works again

diff --git a/regress/scripts/bacula-sd-2disk-drive.conf.in b/regress/scripts/bacula-sd-2disk-drive.conf.in
index 614301dcfe5e727f71fbd7373c2606840b086f34..00f88325fdce83c77d1719d6b44a66e36d8ca097 100644 (file)
--- a/regress/scripts/bacula-sd-2disk-drive.conf.in
+++ b/regress/scripts/bacula-sd-2disk-drive.conf.in
@@ -83,6 +83,7 @@ Device {
   AlwaysOpen = yes;
   RemovableMedia = yes;
   Maximum Concurrent Jobs = 3
+  Volume Poll Interval = 15
 # Maximum File Size = 1000000
 }
 
@@ -97,6 +98,7 @@ Device {
   AlwaysOpen = yes;
   RemovableMedia = yes;
   Maximum Concurrent Jobs = 3
+  Volume Poll Interval = 15
 # Maximum File Size = 1000000
 }
 

diff --git a/regress/tests/virtual-changer-test b/regress/tests/virtual-changer-test
index 7762b3dc6631e312b0bb09009ada16885ebaae32..7c06fcbfc94cca64ea43054b7a7826429ea83509 100755 (executable)
--- a/regress/tests/virtual-changer-test
+++ b/regress/tests/virtual-changer-test
@@ -8,6 +8,16 @@
 #  This test the SD Virtual autochanger feature.  It is a disk based
 #    "autochanger", but does not use any changer script.
 #
+#  Note, because we limit each drive to a maximum of 3 jobs,
+#  the first three start on Drive-0, and the second three start
+#  on drive-1 (Prefer Mounted Volumes = no).  Thus since there
+#  is only one Volume (TestVolume001) that is valid, three jobs
+#  block and ask the user to create a new volume.  However, at some
+#  point, the first three jobs finish and free up TestVolum001, and
+#  Since we set a poll interval of 15 seconds, after a short wait
+#  TestVolume001 will be mounted on drive-1 and the job will
+#  complete.  This tests a good number of things.
+#
 TestName="virtual-changer-test"
 JobName="virtualchangertest"
 . scripts/functions