tests: adapt test config to stricter requirements

If you configure a device, the backend will be checked when the
configuration is loaded. Thus a lot of the existing test configurations
need to be adapted to either use existing storge backends or to have
BackendDirectory configured.

11 files changed, 27 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index f6667e418..c604efe10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,7 @@ core/src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf
 core/src/include/config.h
 core/src/qt-tray-monitor/bareos-tray-monitor.desktop
 core/src/tests/configs/bareos-configparser-tests/bareos-dir-CFG_TYPE_STR_VECTOR_OF_DIRS.conf
+core/src/tests/configs/bareos-configparser-tests/bareos-sd.d/storage/bareos-sd.conf
 core/src/tests/configs/catalog/bareos-dir.d/catalog/MyCatalog.conf
 core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/director/bareos-dir.conf
 core/src/tests/configs/console-director/tls_disabled/bareos-dir.d/fileset/Catalog.conf
@@ -131,6 +132,10 @@ core/src/tests/configs/sd_backend/bareos-sd.d/device/droplet.conf
 core/src/tests/configs/sd_backend/bareos-sd.d/storage/myself.conf
 core/src/tests/configs/sd_backend/droplet.profile
 core/src/tests/configs/sd_reservation/bareos-sd.d/storage/myself.conf
+core/src/tests/configs/statistics_thread/sd_statistics_thread/default_config/bareos-sd.d/storage/myself.conf
+core/src/tests/configs/statistics_thread/sd_statistics_thread/only_collect_set/bareos-sd.d/storage/myself.conf
+core/src/tests/configs/statistics_thread/sd_statistics_thread/only_interval_set/bareos-sd.d/storage/myself.conf
+core/src/tests/configs/stored_multiplied_device/bareos-sd.d/storage/bareos-sd.conf
 core/src/win32/console/consoleres.rc
 core/src/win32/dird/dbcheckres.rc
 core/src/win32/dird/dirdres.rc
diff --git a/core/src/tests/configs/bareos-configparser-tests/bareos-sd.d/storage/bareos-sd.conf b/core/src/tests/configs/bareos-configparser-tests/bareos-sd.d/storage/bareos-sd.conf.in
index 9f4f96c31..c0174978b 100644
--- a/core/src/tests/configs/bareos-configparser-tests/bareos-sd.d/storage/bareos-sd.conf
+++ b/core/src/tests/configs/bareos-configparser-tests/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,6 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "/tmp/tests/backup-bareos-test/working"
   SD Port = 42003
+
+  @UNCOMMENT_SD_BACKEND_DIRECTORY@Backend Directory = @PROJECT_BINARY_DIR@/src/stored/backends
 }
diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf
index 323c43420..117532956 100644
--- a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf
+++ b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf
@@ -14,9 +14,9 @@ Device {
 
 Device {
   Name = auto1dev1
-  Media Type = File
+  Media Type = NonMatchingMediaType
   Archive Device = ./non-existent
-  Device Type = NoSuchBackend
+  Device Type = File
   LabelMedia = yes
   Random Access = yes
   Autochanger = yes
diff --git a/core/src/tests/configs/statistics_thread/sd_statistics_thread/default_config/bareos-sd.d/storage/myself.conf b/core/src/tests/configs/statistics_thread/sd_statistics_thread/default_config/bareos-sd.d/storage/myself.conf
deleted file mode 100644
index b791506cf..000000000
--- a/core/src/tests/configs/statistics_thread/sd_statistics_thread/default_config/bareos-sd.d/storage/myself.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-Storage {
-  Name = test-sd
-}
diff --git a/core/src/tests/configs/statistics_thread/sd_statistics_thread/default_config/bareos-sd.d/storage/myself.conf.in b/core/src/tests/configs/statistics_thread/sd_statistics_thread/default_config/bareos-sd.d/storage/myself.conf.in
new file mode 100644
index 000000000..394794a44
--- /dev/null
+++ b/core/src/tests/configs/statistics_thread/sd_statistics_thread/default_config/bareos-sd.d/storage/myself.conf.in
@@ -0,0 +1,4 @@
+Storage {
+  Name = test-sd
+  @UNCOMMENT_SD_BACKEND_DIRECTORY@Backend Directory = @PROJECT_BINARY_DIR@/src/stored/backends
+}
diff --git a/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_collect_set/bareos-sd.d/storage/myself.conf b/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_collect_set/bareos-sd.d/storage/myself.conf
deleted file mode 100644
index d952a4d5d..000000000
--- a/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_collect_set/bareos-sd.d/storage/myself.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Storage {
-  Name = test-sd
-  Collect Device Statistics = yes
-}
diff --git a/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_collect_set/bareos-sd.d/storage/myself.conf.in b/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_collect_set/bareos-sd.d/storage/myself.conf.in
new file mode 100644
index 000000000..5e5be67f4
--- /dev/null
+++ b/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_collect_set/bareos-sd.d/storage/myself.conf.in
@@ -0,0 +1,5 @@
+Storage {
+  Name = test-sd
+  Collect Device Statistics = yes
+  @UNCOMMENT_SD_BACKEND_DIRECTORY@Backend Directory = @PROJECT_BINARY_DIR@/src/stored/backends
+}
diff --git a/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_interval_set/bareos-sd.d/storage/myself.conf b/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_interval_set/bareos-sd.d/storage/myself.conf
deleted file mode 100644
index 45e845000..000000000
--- a/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_interval_set/bareos-sd.d/storage/myself.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Storage {
-  Name = test-sd
-  Statistics Collect Interval = 150
-}
diff --git a/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_interval_set/bareos-sd.d/storage/myself.conf.in b/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_interval_set/bareos-sd.d/storage/myself.conf.in
new file mode 100644
index 000000000..db56afcad
--- /dev/null
+++ b/core/src/tests/configs/statistics_thread/sd_statistics_thread/only_interval_set/bareos-sd.d/storage/myself.conf.in
@@ -0,0 +1,5 @@
+Storage {
+  Name = test-sd
+  Statistics Collect Interval = 150
+  @UNCOMMENT_SD_BACKEND_DIRECTORY@Backend Directory = @PROJECT_BINARY_DIR@/src/stored/backends
+}
diff --git a/core/src/tests/configs/stored_multiplied_device/bareos-sd.d/storage/bareos-sd.conf b/core/src/tests/configs/stored_multiplied_device/bareos-sd.d/storage/bareos-sd.conf
deleted file mode 100644
index e73e2417f..000000000
--- a/core/src/tests/configs/stored_multiplied_device/bareos-sd.d/storage/bareos-sd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Storage {
-  Name = bareos-sd
-  Maximum Concurrent Jobs = 20
-
-  # remove comment from "Plugin Directory" to load plugins from specified directory.
-  # if "Plugin Names" is defined, only the specified plugins will be loaded,
-  # otherwise all storage plugins (*-sd.so) from the "Plugin Directory".
-  #
-  # Plugin Directory = "/dev/null"
-  # Plugin Names = ""
-}
diff --git a/core/src/tests/configs/stored_multiplied_device/bareos-sd.d/storage/bareos-sd.conf.in b/core/src/tests/configs/stored_multiplied_device/bareos-sd.d/storage/bareos-sd.conf.in
new file mode 100644
index 000000000..ee02d180e
--- /dev/null
+++ b/core/src/tests/configs/stored_multiplied_device/bareos-sd.d/storage/bareos-sd.conf.in
@@ -0,0 +1,4 @@
+Storage {
+  Name = bareos-sd
+  @UNCOMMENT_SD_BACKEND_DIRECTORY@Backend Directory = @PROJECT_BINARY_DIR@/src/stored/backends
+}