diff options
Diffstat (limited to 'test/functional/cases/110_statistics')
5 files changed, 27 insertions, 27 deletions
diff --git a/test/functional/cases/110_statistics/lib.robot b/test/functional/cases/110_statistics/lib.robot index 808580a11..5df8b40f8 100644 --- a/test/functional/cases/110_statistics/lib.robot +++ b/test/functional/cases/110_statistics/lib.robot @@ -1,35 +1,35 @@ *** Settings *** -Library ${TESTDIR}/lib/rspamd.py -Resource ${TESTDIR}/lib/rspamd.robot -Variables ${TESTDIR}/lib/vars.py +Library ${RSPAMD_TESTDIR}/lib/rspamd.py +Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot +Variables ${RSPAMD_TESTDIR}/lib/vars.py *** Variables *** -${CONFIG} ${TESTDIR}/configs/stats.conf -${MESSAGE_SPAM} ${TESTDIR}/messages/spam_message.eml -${MESSAGE_HAM} ${TESTDIR}/messages/ham.eml +${CONFIG} ${RSPAMD_TESTDIR}/configs/stats.conf +${MESSAGE_SPAM} ${RSPAMD_TESTDIR}/messages/spam_message.eml +${MESSAGE_HAM} ${RSPAMD_TESTDIR}/messages/ham.eml ${REDIS_SCOPE} Suite -${REDIS_SERVER} null +${RSPAMD_REDIS_SERVER} null ${RSPAMD_SCOPE} Suite -${STATS_BACKEND} redis -${STATS_HASH} null -${STATS_KEY} null +${RSPAMD_STATS_BACKEND} redis +${RSPAMD_STATS_HASH} null +${RSPAMD_STATS_KEY} null *** Keywords *** Broken Learn Test - ${result} = Run Rspamc -h ${LOCAL_ADDR}:${PORT_CONTROLLER} learn_spam ${MESSAGE_SPAM} + ${result} = Run Rspamc -h ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER} learn_spam ${MESSAGE_SPAM} Check Rspamc ${result} Unknown statistics error Empty Part Test - Set Test Variable ${MESSAGE} ${TESTDIR}/messages/empty_part.eml - ${result} = Run Rspamc -h ${LOCAL_ADDR}:${PORT_CONTROLLER} learn_spam ${MESSAGE} + Set Test Variable ${MESSAGE} ${RSPAMD_TESTDIR}/messages/empty_part.eml + ${result} = Run Rspamc -h ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER} learn_spam ${MESSAGE} Check Rspamc ${result} Scan File ${MESSAGE} Expect Symbol BAYES_SPAM Learn Test Set Suite Variable ${RSPAMD_STATS_LEARNTEST} 0 - ${result} = Run Rspamc -h ${LOCAL_ADDR}:${PORT_CONTROLLER} learn_spam ${MESSAGE_SPAM} - ${result} = Run Rspamc -h ${LOCAL_ADDR}:${PORT_CONTROLLER} learn_ham ${MESSAGE_HAM} + ${result} = Run Rspamc -h ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER} learn_spam ${MESSAGE_SPAM} + ${result} = Run Rspamc -h ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER} learn_ham ${MESSAGE_HAM} Check Rspamc ${result} Scan File ${MESSAGE_SPAM} Expect Symbol BAYES_SPAM @@ -39,7 +39,7 @@ Learn Test Relearn Test Run Keyword If ${RSPAMD_STATS_LEARNTEST} == 0 Fail "Learn test was not run" - ${result} = Run Rspamc -h ${LOCAL_ADDR}:${PORT_CONTROLLER} learn_ham ${MESSAGE_SPAM} + ${result} = Run Rspamc -h ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER} learn_ham ${MESSAGE_SPAM} Check Rspamc ${result} Scan File ${MESSAGE_SPAM} ${pass} = Run Keyword And Return Status Expect Symbol BAYES_HAM @@ -48,7 +48,7 @@ Relearn Test Redis Statistics Setup Run Redis - New Setup STATS_BACKEND=${STATS_BACKEND} STATS_HASH=${STATS_HASH} STATS_KEY=${STATS_KEY} REDIS_SERVER=${REDIS_SERVER} + New Setup Redis Statistics Teardown Normal Teardown diff --git a/test/functional/cases/110_statistics/redis-keyed-siphash.robot b/test/functional/cases/110_statistics/redis-keyed-siphash.robot index cc4320102..b85ae589c 100644 --- a/test/functional/cases/110_statistics/redis-keyed-siphash.robot +++ b/test/functional/cases/110_statistics/redis-keyed-siphash.robot @@ -4,9 +4,9 @@ Suite Teardown Redis Statistics Teardown Resource lib.robot *** Variables *** -${REDIS_SERVER} ${REDIS_ADDR}:${REDIS_PORT} -${STATS_HASH} siphash -${STATS_KEY} ${KEY_PVT1} +${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT} +${RSPAMD_STATS_HASH} siphash +${RSPAMD_STATS_KEY} ${RSPAMD_KEY_PVT1} *** Test Cases *** Learn diff --git a/test/functional/cases/110_statistics/redis-keyed-xxhash.robot b/test/functional/cases/110_statistics/redis-keyed-xxhash.robot index ba550df20..f62d6bbd9 100644 --- a/test/functional/cases/110_statistics/redis-keyed-xxhash.robot +++ b/test/functional/cases/110_statistics/redis-keyed-xxhash.robot @@ -4,9 +4,9 @@ Suite Teardown Redis Statistics Teardown Resource lib.robot *** Variables *** -${REDIS_SERVER} ${REDIS_ADDR}:${REDIS_PORT} -${STATS_HASH} xxhash -${STATS_KEY} ${KEY_PVT1} +${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT} +${RSPAMD_STATS_HASH} xxhash +${RSPAMD_STATS_KEY} ${RSPAMD_KEY_PVT1} *** Test Cases *** Learn diff --git a/test/functional/cases/110_statistics/redis-plain-siphash.robot b/test/functional/cases/110_statistics/redis-plain-siphash.robot index 10e28a26b..99a5baf18 100644 --- a/test/functional/cases/110_statistics/redis-plain-siphash.robot +++ b/test/functional/cases/110_statistics/redis-plain-siphash.robot @@ -4,8 +4,8 @@ Suite Teardown Redis Statistics Teardown Resource lib.robot *** Variables *** -${REDIS_SERVER} ${REDIS_ADDR}:${REDIS_PORT} -${STATS_HASH} siphash +${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT} +${RSPAMD_STATS_HASH} siphash *** Test Cases *** Learn diff --git a/test/functional/cases/110_statistics/redis-plain-xxhash.robot b/test/functional/cases/110_statistics/redis-plain-xxhash.robot index 47533d9be..755ccfb89 100644 --- a/test/functional/cases/110_statistics/redis-plain-xxhash.robot +++ b/test/functional/cases/110_statistics/redis-plain-xxhash.robot @@ -4,8 +4,8 @@ Suite Teardown Redis Statistics Teardown Resource lib.robot *** Variables *** -${REDIS_SERVER} ${REDIS_ADDR}:${REDIS_PORT} -${STATS_HASH} xxhash +${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT} +${RSPAMD_STATS_HASH} xxhash *** Test Cases *** Learn |