From c5538e760c8f8424e3ba389e45716b5997fe2375 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Mon, 28 Aug 2017 12:16:26 +0200 Subject: [PATCH] [Test] Settings: few more tests --- test/functional/cases/108_settings.robot | 36 ++++++++++++++++++++++-- test/functional/lua/settings.lua | 3 ++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/test/functional/cases/108_settings.robot b/test/functional/cases/108_settings.robot index 9a5a92e42..4ed2b53f5 100644 --- a/test/functional/cases/108_settings.robot +++ b/test/functional/cases/108_settings.robot @@ -19,18 +19,50 @@ NO SETTINGS Should Contain ${result.stdout} SIMPLE_PRE Should Contain ${result.stdout} SIMPLE_POST -ENABLE SYMBOL - SIMPLE_TEST +ENABLE SYMBOL - NORMAL ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={symbols_enabled = ["SIMPLE_TEST"]} Check Rspamc ${result} SIMPLE_TEST Should Not Contain ${result.stdout} SIMPLE_PRE Should Not Contain ${result.stdout} SIMPLE_POST -ENABLE SYMBOL - SIMPLE_POST +ENABLE SYMBOL - POSTFILTER ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={symbols_enabled = ["SIMPLE_TEST", "SIMPLE_POST"]} Check Rspamc ${result} SIMPLE_TEST Should Contain ${result.stdout} SIMPLE_POST Should Not Contain ${result.stdout} SIMPLE_PRE +ENABLE SYMBOL - PREFILTER + ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={symbols_enabled = ["SIMPLE_PRE"]} + Check Rspamc ${result} SIMPLE_PRE + Should Not Contain ${result.stdout} SIMPLE_POST + Should Not Contain ${result.stdout} SIMPLE_TEST + +DISABLE SYMBOL - NORMAL + ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={symbols_disabled = ["SIMPLE_TEST"]} + Check Rspamc ${result} SIMPLE_TEST inverse=1 + Should Contain ${result.stdout} SIMPLE_PRE + Should Contain ${result.stdout} SIMPLE_POST + +RESCORE SYMBOL - NORMAL + ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={SIMPLE_TEST = 3.33} + Check Rspamc ${result} SIMPLE_TEST (3.33) + +RESCORE ACTION + ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={actions { reject = 1234.5; } } + Check Rspamc ${result} ${SPACE}/ 1234.50 + +DISABLE GROUP - NORMAL + ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={groups_disabled = ["b"]} + Check Rspamc ${result} SIMPLE_TEST inverse=1 + Should Contain ${result.stdout} SIMPLE_PRE + Should Contain ${result.stdout} SIMPLE_POST + +ENABLE GROUP - NORMAL + ${result} = Scan Message With Rspamc ${MESSAGE} --header Settings={groups_enabled = ["b"]} + Check Rspamc ${result} SIMPLE_TEST + Should Not Contain ${result.stdout} SIMPLE_PRE + Should Not Contain ${result.stdout} SIMPLE_POST + *** Keywords *** Settings Setup ${PLUGIN_CONFIG} = Get File ${TESTDIR}/configs/settings.conf diff --git a/test/functional/lua/settings.lua b/test/functional/lua/settings.lua index 0be6f71bf..e52325dac 100644 --- a/test/functional/lua/settings.lua +++ b/test/functional/lua/settings.lua @@ -2,6 +2,7 @@ rspamd_config:register_symbol({ name = 'SIMPLE_PRE', score = 1.0, priority = 9, -- after settings + group = 'a', type = 'prefilter', callback = function() return true, 'Fires always' @@ -12,6 +13,7 @@ rspamd_config:register_symbol({ name = 'SIMPLE_POST', score = 1.0, type = 'postfilter', + group = 'c', callback = function() return true, 'Fires always' end @@ -20,6 +22,7 @@ rspamd_config:register_symbol({ rspamd_config:register_symbol({ name = 'SIMPLE_TEST', score = 1.0, + group = 'b', callback = function() return true, 'Fires always' end -- 2.39.5