From: Michal Rakowski <michal.rakowski@baculasystems.com>
Date: Wed, 19 May 2021 16:45:36 +0000 (+0200)
Subject: regress: tweak store-mngr tests
X-Git-Tag: Release-11.3.2~532
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef9a6dd4c2910a92dab8c51e13dbe21715a0bedc;p=thirdparty%2Fbacula.git

regress: tweak store-mngr tests
---

diff --git a/regress/tests/store-mngr-connection-err-test b/regress/tests/store-mngr-connection-err-test
index 4a6532aeb..7aa43555e 100755
--- 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 e55603cfd..d3581683d 100755
--- 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 413db73cd..456966c6a 100755
--- 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
 }