commit 7077b64: [Test] Avoid importing user configuration
Andrew Lewis
nerf at judo.za.org
Wed Sep 15 13:07:04 UTC 2021
Author: Andrew Lewis
Date: 2021-09-15 13:31:44 +0200
URL: https://github.com/rspamd/rspamd/commit/7077b64c2352d6993f3c71e5f9226270a5af2f2b (refs/pull/3892/head)
[Test] Avoid importing user configuration
---
test/functional/lib/rspamd.robot | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index e7f2da1c7..36524dbe4 100644
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -3,6 +3,9 @@ Library Collections
Library OperatingSystem
Library Process
+*** Variables ***
+${SET_LOCAL_CONFDIR} --var=LOCAL_CONFDIR=/no/no/no/
+
*** Keywords ***
Check Controller Errors
@{result} = HTTP GET ${RSPAMD_LOCAL_ADDR} ${RSPAMD_PORT_CONTROLLER} /errors
@@ -226,7 +229,7 @@ Run Rspamd
Export Rspamd Variables To Environment
# Dump templated config or errors to log
- ${result} = Run Process ${RSPAMADM} configdump -c ${CONFIG}
+ ${result} = Run Process ${RSPAMADM} ${SET_LOCAL_CONFDIR} configdump -c ${CONFIG}
# We need to send output to files (or discard output) to avoid hanging Robot
... stdout=${RSPAMD_TMPDIR}/configdump.stdout stderr=${RSPAMD_TMPDIR}/configdump.stderr
${configdump} = Run Keyword If ${result.rc} == 0 Get File ${RSPAMD_TMPDIR}/configdump.stdout
@@ -237,7 +240,7 @@ Run Rspamd
Set Directory Ownership ${RSPAMD_TMPDIR} ${RSPAMD_USER} ${RSPAMD_GROUP}
# Run Rspamd
- ${result} = Run Process ${RSPAMD} -u ${RSPAMD_USER} -g ${RSPAMD_GROUP}
+ ${result} = Run Process ${RSPAMD} ${SET_LOCAL_CONFDIR} -u ${RSPAMD_USER} -g ${RSPAMD_GROUP}
... -c ${CONFIG} env:TMPDIR=${RSPAMD_TMPDIR} env:DBDIR=${RSPAMD_TMPDIR} env:LD_LIBRARY_PATH=${RSPAMD_TESTDIR}/../../contrib/aho-corasick
# We need to send output to files (or discard output) to avoid hanging Robot
... stdout=${RSPAMD_TMPDIR}/rspamd.stdout stderr=${RSPAMD_TMPDIR}/rspamd.stderr
More information about the Commits
mailing list