Tweak multi2-storage-test

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 48a1c8acf9c42171db902d7add9d143b979484c5..18494e9c4e57cd3b7a36b725245301980241882c 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -184,7 +184,7 @@ Storage {
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
   Device = FileStorage                # must be same as Device in Storage daemon
-  Media Type = FileMedia              # must be same as MediaType in Storage daemon
+  Media Type = FileMedia2             # must be same as MediaType in Storage daemon
   Maximum Concurrent Jobs = 100
 }
 
@@ -195,7 +195,7 @@ Storage {
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
   Device = FileStorage                # must be same as Device in Storage daemon
-  Media Type = FileMedia              # must be same as MediaType in Storage daemon
+  Media Type = FileMedia3             # must be same as MediaType in Storage daemon
   Maximum Concurrent Jobs = 100
 }
 
@@ -206,7 +206,7 @@ Storage {
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
   Device = FileStorage                # must be same as Device in Storage daemon
-  Media Type = FileMedia              # must be same as MediaType in Storage daemon
+  Media Type = FileMedia4             # must be same as MediaType in Storage daemon
   Maximum Concurrent Jobs = 100
 }
 

diff --git a/regress/scripts/bacula-sd-2disk.conf.in b/regress/scripts/bacula-sd-2disk.conf.in
index f63d3e3ce36a9fd71f4a11d36e87e0a96b531d34..7f8f33e9fb1b896aa65db3739dda1d2d367b4154 100644 (file)
--- a/regress/scripts/bacula-sd-2disk.conf.in
+++ b/regress/scripts/bacula-sd-2disk.conf.in
@@ -100,7 +100,7 @@ Device {
 
 Device {
   Name = FileStorage
-  Media Type = FileMedia
+  mediatype = FileMedia
   Archive Device = @tmpdir@
   LabelMedia = yes;                   # lets Bacula label unlabeled media
   Random Access = Yes;

diff --git a/regress/tests/multi2-storage-test b/regress/tests/multi2-storage-test
index ca9b3796ebf47b97415bd97531867ebf26f92ff9..3f2a418be63cb264f7179af2195af343e36d421e 100755 (executable)
--- a/regress/tests/multi2-storage-test
+++ b/regress/tests/multi2-storage-test
@@ -14,7 +14,8 @@ scripts/prepare-disk-changer
 for i in 2 3 4; do
   perl -ne "\$i='$i';\$tmp='$tmp';"'
   if (/SDPort = /) { $_ =~ s/(\d+)/1810$i/}
-  if (/Name = .+?-sd/) { $_ =~ s/-sd/-sd$i/}
+  if (/Name = /) { $_ =~ s/FileStorage/FileStorage$i/}
+  if (/mediatype = /) { $_ =~ s/FileMedia/FileMedia$1/}
   if (/WorkingDirectory/) { $_ =~ s:working:tmp/$i:}
   if (/Pid Directory/) { $_ =~ s:working:tmp/$i:}
   if (/(Archive|Changer) Device/) { $_ =~ s:$tmp:$tmp/$i:}
@@ -52,9 +53,24 @@ messages
 @$out ${cwd}/tmp/log1.out
 label storage=tape volume=TestVolume001 Pool=Default slot=1 drive=0
 label storage=File  volume=TestVolume002 Pool=Default
+label storage=File2 volume=File2-Vol001 Pool=Default
+label storage=File3 volume=File3-Vol001 Pool=Default
+label storage=File4 volume=File4-Vol001 Pool=Default
 run job=$JobName storage=tape yes
 wait
 messages
+run job=$JobName storage=File yes
+wait
+messages
+run job=$JobName storage=File2 yes
+wait
+messages
+run job=$JobName storage=File3 yes
+wait
+messages
+run job=$JobName storage=File4 yes
+wait
+messages
 quit
 END_OF_DATA
 
@@ -77,6 +93,15 @@ messages
 run level=Incremental storage=File job=$JobName yes
 wait
 messages
+run level=Incremental storage=File2 job=$JobName yes
+wait
+messages
+run level=Incremental storage=File3 job=$JobName yes
+wait
+messages
+run level=Incremental storage=File4 job=$JobName yes
+wait
+messages
 @# 
 @# now do a restore
 @#