Tweak multi2-storage-test

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 0a71657ba4c86963a9070a9d8ba2b2d27b112d13..48a1c8acf9c42171db902d7add9d143b979484c5 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -166,19 +166,6 @@ Client {
   Maximum Concurrent Jobs = 100
 }
 
-# Definition of DDS tape storage device
-Storage {
-  Name = tape
-  Address = @hostname@                # N.B. Use a fully qualified name here
-  SDPort = @sdport@
-  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
-  Device = tape                      # must be same as Device in Storage daemon
-  Media Type = tape                  # must be same as MediaType in Storage daemon
-  Maximum Concurrent Jobs = 100
-# Autochanger = yes
-}
-
-
 # Definition of File storage device
 Storage {
   Name = File
@@ -201,7 +188,6 @@ Storage {
   Maximum Concurrent Jobs = 100
 }
 
-
 # Definition of File3 storage device
 Storage {
   Name = File3
@@ -224,7 +210,17 @@ Storage {
   Maximum Concurrent Jobs = 100
 }
 
-
+# Definition of DDS tape storage device
+Storage {
+  Name = tape
+  Address = @hostname@                # N.B. Use a fully qualified name here
+  SDPort = @sdport@
+  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
+  Device = tape                      # must be same as Device in Storage daemon
+  Media Type = tape                  # must be same as MediaType in Storage daemon
+  Maximum Concurrent Jobs = 100
+# Autochanger = yes
+}
 
 # Definition of Virtual storage device
 Storage {

diff --git a/regress/tests/multi2-storage-test b/regress/tests/multi2-storage-test
index c33daed79720c193871c489c5530d1f2b3606c2c..22b1aeb2198e82d0a85a647f070336fb27fbc1b9 100755 (executable)
--- a/regress/tests/multi2-storage-test
+++ b/regress/tests/multi2-storage-test
@@ -12,17 +12,19 @@ scripts/prepare-disk-changer
 
 # create a new bacula-sd.confs
 for sd in 2 3 4; do
-  perl -ne '
-  if (/SDPort = /) { $_ =~ s/(\d+)/1810$sd/;}
-  if (/Name = .+?-sd/) { $_ =~ s/-sd/-sd$sd/;}
-  if (/WorkingDirectory/) { $_ =~ s/"$/$sd"/; }
-  if (/Pid Directory/) { $_ =~ s/"$/$sd"/; }
+  perl -ne "\$sd=$sd;\$tmp='$tmp';"'
+  if (/SDPort = /) { $_ =~ s/(\d+)/1810$sd/}
+  if (/Name = .+?-sd/) { $_ =~ s/-sd/-sd$sd/}
+  if (/WorkingDirectory/) { $_ = "$tmp/$sd"}
+  if (/Pid Directory/) {    $_ = "$tmp/$sd"}
+  if (/(Archive|Changer) Device/) { $_ =~ s:$tmp:$tmp/$sd:}
   print;
   ' $conf/bacula-sd.conf > $conf/bacula-sd$sd.conf
   mkdir -p ${working}$sd
   sed 's/bacula-sd.conf/bacula-sd$sd.conf/' $scripts/bacula-ctl-sd \
       > $tmp/bacula-ctl-sd$sd
   chmod +x $tmp/bacula-ctl-sd$sd
+  mkdir -p $tmp/$sd
 done
 
 # Patch up bacula-dir.conf
@@ -84,9 +86,10 @@ setdebug trace=1 level=110 director
 restore where=${cwd}/tmp/bacula-restores select all done yes
 wait
 messages
+show storage
 sql
-select * in Storage;
-
+select * FROM Storage;
+select VolumeName, Name, StorageId, MediaType FROM Media JOIN Storage USING (StorageId);
 
 quit
 END_OF_DATA