fix package tests for 1.5.6-rc2

crowdsecurity · Dec 9, 2023 · 88a16e6 · 88a16e6
1 parent 0c02949
commit 88a16e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/test/bats/01_crowdsec.bats b/test/bats/01_crowdsec.bats
@@ -232,6 +232,8 @@ teardown() {
     ACQUIS_YAML=$(config_get '.crowdsec_service.acquisition_path')
     config_set "$ACQUIS_YAML" 'del(.filenames)'
 
+    # if filenames are missing, it won't be able to detect source type
+    config_set "$ACQUIS_YAML" '.source="file"'
     rune -1 wait-for "${CROWDSEC}"
     assert_stderr --partial "failed to configure datasource file: no filename or filenames configuration provided"
 

diff --git a/test/lib/config/config-global b/test/lib/config/config-global
@@ -54,10 +54,18 @@ remove_init_data() {
 
 # we need a separate function for initializing config when testing package
 # because we want to test the configuration as well
+config_prepare() {
+    # remove trailing slash from CONFIG_DIR
+    # since it's assumed to be missing during the tests
+    yq e -i '
+        .config_paths.config_dir |= sub("/$", "")
+    ' "${CONFIG_DIR}/config.yaml"
+}
 
 make_init_data() {
     ./bin/assert-crowdsec-not-running || die "Cannot create fixture data."
 
+    config_prepare
     ./instance-db config-yaml
     ./instance-db setup