regress: fix store-mngr-freespace-test

diff --git a/regress/tests/store-mngr-freespace-test b/regress/tests/store-mngr-freespace-test
index 6abc00606788bb92b83193433de200c042388057..30f942e4f2ea389c5ad07329687070a346f36fa8 100755 (executable)
--- a/regress/tests/store-mngr-freespace-test
+++ b/regress/tests/store-mngr-freespace-test
@@ -32,9 +32,9 @@ dd if=/dev/zero of=$tmp/disk1 bs=1M count=200 > /dev/null
 dd if=/dev/zero of=$tmp/disk2 bs=1M count=400 > /dev/null
 dd if=/dev/zero of=$tmp/disk3 bs=1M count=600 > /dev/null
 
-mkfs.ext2 -F $tmp/disk1 > /dev/null
-mkfs.ext2 -F $tmp/disk2 > /dev/null
-mkfs.ext2 -F $tmp/disk3 > /dev/null
+mkfs.ext2 -F $tmp/disk1
+mkfs.ext2 -F $tmp/disk2
+mkfs.ext2 -F $tmp/disk3
 
 mkdir -p $dev1
 mkdir -p $dev2
@@ -54,6 +54,7 @@ sudo chown -R $user:$user $dev3
 
 # Get SD password
 sd_pass=`grep -i password ${bin}/bacula-sd.conf | head -n 1`
+SDPORT=`expr $BASEPORT + 2`
 
 # Add simple job with store group
 cat <<END_OF_DATA >> $bin/bacula-dir.conf
@@ -82,8 +83,8 @@ Job {
 
 Autochanger {
   Name = Disk1
-  Address = VBox                # N.B. Use a fully qualified name here
-  SDPort = 8112
+  Address = localhost                # N.B. Use a fully qualified name here
+  SDPort = $SDPORT
 ${sd_pass}
   Device = Disk1
   Media Type = Disk1
@@ -93,8 +94,8 @@ ${sd_pass}
 
 Autochanger {
   Name = Disk2
-  Address = VBox                # N.B. Use a fully qualified name here
-  SDPort = 8112
+  Address = localhost                # N.B. Use a fully qualified name here
+  SDPort = $SDPORT
 ${sd_pass}
   Device = Disk2
   Media Type = Disk2
@@ -104,8 +105,8 @@ ${sd_pass}
 
 Autochanger {
   Name = Disk3
-  Address = VBox                # N.B. Use a fully qualified name here
-  SDPort = 8112
+  Address = localhost                # N.B. Use a fully qualified name here
+  SDPort = $SDPORT
 ${sd_pass}
   Device = Disk3
   Media Type = Disk3
@@ -177,8 +178,6 @@ $bperl -e 'add_attribute("$conf/bacula-dir.conf", "MaximumConcurrentJobs", "10",
 
 start_test
 
-run_bacula
-
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
@@ -190,8 +189,7 @@ messages
 quit
 END_OF_DATA
 
-run_bconsole
-
+run_bacula
 
 # Disk3 has the biggest amount of free space hence it should be used now
 n_disk1=`cat ${cwd}/tmp/log2.out | grep "Storage:" | tr -s ' ' | grep "Storage: \"Disk1\"" | wc -l`