diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2022-11-15 20:15:37 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2022-11-15 20:25:52 +0000 |
| commit | 8922b5932bf1d21cfbeea2413d2d9daf6e5ada8b (patch) | |
| tree | 259e9e6ea7cf1c07b2342e25a997c6d617d52889 /test | |
| parent | 22ef1c6323563881d02d4815086e92a349d54f6b (diff) | |
| download | rspamd-8922b5932bf1d21cfbeea2413d2d9daf6e5ada8b.tar.gz rspamd-8922b5932bf1d21cfbeea2413d2d9daf6e5ada8b.zip | |
[Test] Fix multiple test issues
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/configs/merged.conf | 2 | ||||
| -rw-r--r-- | test/functional/lib/rspamd.robot | 29 |
2 files changed, 23 insertions, 8 deletions
diff --git a/test/functional/configs/merged.conf b/test/functional/configs/merged.conf index 60930f657..0718d0210 100644 --- a/test/functional/configs/merged.conf +++ b/test/functional/configs/merged.conf @@ -1,4 +1,4 @@ -.include "{= env.INSTALLROOT =}/etc/rspamd/rspamd.conf" +.include "{= env.TESTDIR =}/../../conf/rspamd.conf" lua = "{= env.TESTDIR =}/lua/test_coverage.lua" diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot index a7693fb2a..de4a188fb 100644 --- a/test/functional/lib/rspamd.robot +++ b/test/functional/lib/rspamd.robot @@ -3,9 +3,6 @@ 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 @@ -229,7 +226,17 @@ Run Rspamd Export Rspamd Variables To Environment # Dump templated config or errors to log - ${result} = Run Process ${RSPAMADM} ${SET_LOCAL_CONFDIR} configdump -c ${CONFIG} + ${result} = Run Process ${RSPAMADM} + ... --var\=TMPDIR\=${RSPAMD_TMPDIR} + ... --var\=DBDIR\=${RSPAMD_TMPDIR} + ... --var\=LOCAL_CONFDIR\=/non-existent + ... --var\=CONFDIR\=${RSPAMD_TESTDIR}/../../conf/ + ... configdump -c ${CONFIG} + ... env:RSPAMD_LOCAL_CONFDIR=/non-existent + ... env:RSPAMD_TMPDIR=${RSPAMD_TMPDIR} + ... env:RSPAMD_CONFDIR=${RSPAMD_TESTDIR}/../../conf/ + ... env:LD_LIBRARY_PATH=${RSPAMD_TESTDIR}/../../contrib/aho-corasick + ... env:ASAN_OPTIONS=quarantine_size_mb=2048:malloc_context_size=20:fast_unwind_on_malloc=0:log_path=${RSPAMD_TMPDIR}/rspamd-asan # 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 @@ -240,9 +247,17 @@ Run Rspamd Set Directory Ownership ${RSPAMD_TMPDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} # Run Rspamd - ${result} = Run Process ${RSPAMD} ${SET_LOCAL_CONFDIR} -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} - ... -c ${CONFIG} env:TMPDIR=${RSPAMD_TMPDIR} env:RSPAMD_DBDIR=${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 + ${result} = Run Process ${RSPAMD} -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} + ... -c ${CONFIG} + ... --var\=TMPDIR\=${RSPAMD_TMPDIR} + ... --var\=DBDIR\=${RSPAMD_TMPDIR} + ... --var\=LOCAL_CONFDIR\=/non-existent + ... --var\=CONFDIR\=${RSPAMD_TESTDIR}/../../conf/ + ... env:RSPAMD_LOCAL_CONFDIR=/non-existent + ... env:RSPAMD_TMPDIR=${RSPAMD_TMPDIR} + ... env:RSPAMD_CONFDIR=${RSPAMD_TESTDIR}/../../conf/ + ... env:LD_LIBRARY_PATH=${RSPAMD_TESTDIR}/../../contrib/aho-corasick + ... env:ASAN_OPTIONS=quarantine_size_mb=2048:malloc_context_size=20:fast_unwind_on_malloc=0:log_path=${RSPAMD_TMPDIR}/rspamd-asan ... stdout=${RSPAMD_TMPDIR}/rspamd.stdout stderr=${RSPAMD_TMPDIR}/rspamd.stderr # Log stdout/stderr |