regress: tweak store-mngr tests

diff --git a/regress/tests/store-mngr-connection-err-test b/regress/tests/store-mngr-connection-err-test
index 4a6532aebfc7ceac13eca34ef147fc07be0e2044..7aa43555e43b1279982dfd9705fb0a8794ec590c 100755 (executable)
--- a/regress/tests/store-mngr-connection-err-test
+++ b/regress/tests/store-mngr-connection-err-test
@@ -61,12 +61,6 @@ END_OF_DATA
 
 run_bacula
 
-n=`cat ${cwd}/tmp/log1.out | grep "Possible storage choices: \"File3, File2, File1\"" | wc -l`
-if [ $n -ne 1 ]; then
-   estat=1
-   print_debug "Did not found list of possible storages in job lob"
-fi
-
 # File3 should be skipped since it's not reachable, File2 should be used instead
 n_file2=`cat ${cwd}/tmp/log1.out | grep "Storage:" | tr -s ' ' | grep "Storage: \"File2\"" | wc -l`
 if [ $n_file2 -ne 1 ]; then

diff --git a/regress/tests/store-mngr-invalid-dev-test b/regress/tests/store-mngr-invalid-dev-test
index e55603cfd6b9644723490b986e27d4cc3e295965..d3581683d36d5ed41d02d991bb815f37cd93ee1d 100755 (executable)
--- a/regress/tests/store-mngr-invalid-dev-test
+++ b/regress/tests/store-mngr-invalid-dev-test
@@ -19,6 +19,7 @@ Job {
   Type = Backup
   JobDefs = "DefaultJob"
   Storage = File1, File2
+  Storage Group Policy = Listed Order
   Pool = Default
   Maximum Concurrent Jobs = 10
 }

diff --git a/regress/tests/store-mngr-leastused-test b/regress/tests/store-mngr-leastused-test
index 413db73cdb597511ec5e9bf5a0458dad190f83d5..456966c6af733a8f94d615552bea29f7a33b7161 100755 (executable)
--- a/regress/tests/store-mngr-leastused-test
+++ b/regress/tests/store-mngr-leastused-test
@@ -27,7 +27,7 @@ Job {
   Type = Backup
   JobDefs = "DefaultJob"
   Storage = File1, File2
-  StoragePolicy = LeastUsed
+  Storage Group Policy = LeastUsed
   Pool = Default
   Maximum Concurrent Jobs = 10
 }