commit 5569dba: [Test] Cleanup
Andrew Lewis
nerf at judo.za.org
Wed May 5 14:07:07 UTC 2021
Author: Andrew Lewis
Date: 2021-05-05 00:42:11 +0200
URL: https://github.com/rspamd/rspamd/commit/5569dbacfc83c42e68e8668d065707023212c6eb (refs/pull/3734/head)
[Test] Cleanup
- Use consistent naming for setup/teardown
- Remove some unused files
- Sort & align variables
---
test/functional/cases/100_general.robot | 12 +--
test/functional/cases/101_lua.robot | 20 ++--
test/functional/cases/102_multimap.robot | 47 ++++----
test/functional/cases/103_password.robot | 12 +--
test/functional/cases/104_get_from.robot | 23 ++--
test/functional/cases/105_mimetypes.robot | 14 +--
test/functional/cases/106_mid.robot | 10 +-
test/functional/cases/108_settings.robot | 26 ++---
test/functional/cases/109_composites.robot | 16 ++-
test/functional/cases/110_statistics/lib.robot | 23 ++--
.../cases/110_statistics/redis-keyed-siphash.robot | 8 +-
.../cases/110_statistics/redis-keyed-xxhash.robot | 8 +-
.../cases/110_statistics/redis-plain-siphash.robot | 6 +-
.../cases/110_statistics/redis-plain-xxhash.robot | 6 +-
test/functional/cases/114_phishing.robot | 20 ++--
test/functional/cases/115_dmarc.robot | 14 +--
test/functional/cases/116_dkim.robot | 14 +--
test/functional/cases/117_spf.robot | 14 +--
test/functional/cases/120_fuzzy/encrypted.robot | 2 +-
.../cases/120_fuzzy/fasthash-keyed.robot | 2 +-
test/functional/cases/120_fuzzy/fasthash.robot | 2 +-
test/functional/cases/120_fuzzy/general.robot | 2 +-
test/functional/cases/120_fuzzy/lib.robot | 49 ++++-----
.../functional/cases/120_fuzzy/mumhash-keyed.robot | 2 +-
test/functional/cases/120_fuzzy/mumhash.robot | 2 +-
.../functional/cases/120_fuzzy/siphash-keyed.robot | 2 +-
test/functional/cases/120_fuzzy/siphash.robot | 2 +-
test/functional/cases/120_fuzzy/xxhash-keyed.robot | 2 +-
test/functional/cases/120_fuzzy/xxhash.robot | 2 +-
test/functional/cases/121_json/100_preresult.robot | 12 +--
test/functional/cases/121_json/101_simple.robot | 12 +--
test/functional/cases/121_json/lib.robot | 3 -
test/functional/cases/123_whitelist.robot | 26 ++---
test/functional/cases/125_map_reload.robot | 10 +-
.../cases/131_dkim_signing/001_simple.robot | 16 +--
.../cases/131_dkim_signing/002_redis.robot | 15 ++-
.../cases/131_dkim_signing/003_eddsa.robot | 16 +--
.../131_dkim_signing/004_invalidate_key.robot | 14 +--
.../cases/131_dkim_signing/005_multiple.robot | 16 +--
.../cases/131_dkim_signing/006_milter.robot | 10 +-
.../cases/131_dkim_signing/007_sign_maps.robot | 16 +--
test/functional/cases/135_spamassassin.robot | 10 +-
test/functional/cases/140_proxy.robot | 16 +--
test/functional/cases/151_rspamadm_async.robot | 11 +-
test/functional/cases/160_antivirus.robot | 21 ++--
test/functional/cases/161_p0f.robot | 17 ++-
test/functional/cases/162_url_redirector.robot | 20 ++--
test/functional/cases/180_milter.robot | 13 +--
.../cases/210_clickhouse/001_migration.robot | 2 +-
test/functional/cases/220_http.robot | 12 +--
test/functional/cases/230_tcp.robot | 14 +--
test/functional/cases/231_tcp_down.robot | 12 +--
test/functional/cases/240_redis.robot | 19 ++--
test/functional/cases/241_redis_is_dead.robot | 14 +--
test/functional/cases/250_dns.robot | 12 +--
test/functional/cases/260_regex.robot | 14 +--
test/functional/cases/270_selector.robot | 21 ++--
test/functional/cases/280_rules.robot | 35 +++---
test/functional/cases/281_fnames.robot | 12 +--
test/functional/cases/290_greylist.robot | 24 ++---
test/functional/cases/300_rbl.robot | 20 ++--
test/functional/cases/310_udp.robot | 12 +--
.../cases/320_arc_signing/001_simple.robot | 16 +--
.../cases/320_arc_signing/002_redis.robot | 15 ++-
test/functional/cases/321_arc_check.robot | 14 +--
.../cases/330_neural/001_autotrain.robot | 19 ++--
.../cases/330_neural/002_manualtrain.robot | 19 ++--
test/functional/cases/340_surbl.robot | 18 +---
test/functional/cases/350_magic.robot | 16 ++-
test/functional/cases/360_force_actions.robot | 20 ++--
test/functional/configs/fuzzy_master_worker.conf | 12 ---
test/functional/configs/fuzzy_slave_worker.conf | 11 --
test/functional/configs/pluginsplus.conf | 41 -------
test/functional/lib/rspamd.robot | 119 ++++++++++-----------
74 files changed, 477 insertions(+), 702 deletions(-)
diff --git a/test/functional/cases/100_general.robot b/test/functional/cases/100_general.robot
index c7ce01d97..e76b07c54 100644
--- a/test/functional/cases/100_general.robot
+++ b/test/functional/cases/100_general.robot
@@ -1,15 +1,15 @@
*** Settings ***
-Suite Setup New Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/trivial.conf
-${GTUBE} ${RSPAMD_TESTDIR}/messages/gtube.eml
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/trivial.conf
+${GTUBE} ${RSPAMD_TESTDIR}/messages/gtube.eml
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
*** Test Cases ***
GTUBE
diff --git a/test/functional/cases/101_lua.robot b/test/functional/cases/101_lua.robot
index 168f0e8bb..67e0d35ec 100644
--- a/test/functional/cases/101_lua.robot
+++ b/test/functional/cases/101_lua.robot
@@ -1,17 +1,17 @@
*** Settings ***
-Test Teardown Normal Teardown
+Test Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/lua_test.conf
-${MAP_MAP} ${RSPAMD_TESTDIR}/configs/maps/map.list
-${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
-${RADIX_MAP} ${RSPAMD_TESTDIR}/configs/maps/ip2.list
-${REGEXP_MAP} ${RSPAMD_TESTDIR}/configs/maps/regexp.list
-${RSPAMD_SCOPE} Test
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/lua_test.conf
+${MAP_MAP} ${RSPAMD_TESTDIR}/configs/maps/map.list
+${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
+${RADIX_MAP} ${RSPAMD_TESTDIR}/configs/maps/ip2.list
+${REGEXP_MAP} ${RSPAMD_TESTDIR}/configs/maps/regexp.list
+${RSPAMD_SCOPE} Test
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
*** Test Cases ***
Flags
@@ -73,7 +73,7 @@ Rule conditions
Lua Setup
[Arguments] ${RSPAMD_LUA_SCRIPT}
Set Test Variable ${RSPAMD_LUA_SCRIPT}
- New Setup
+ Rspamd Setup
Lua Replace Setup
[Arguments] ${LUA_SCRIPT_UNESC}
@@ -85,7 +85,7 @@ Lua Replace Setup
Lua Replace Teardown
Remove File ${RSPAMD_LUA_SCRIPT}
- Normal Teardown
+ Rspamd Teardown
TLD Setup
[Arguments] ${RSPAMD_LUA_SCRIPT}
diff --git a/test/functional/cases/102_multimap.robot b/test/functional/cases/102_multimap.robot
index 679a4c183..8085ad748 100644
--- a/test/functional/cases/102_multimap.robot
+++ b/test/functional/cases/102_multimap.robot
@@ -1,28 +1,28 @@
*** Settings ***
-Suite Setup Multimap Setup
-Suite Teardown Multimap Teardown
+Suite Setup Rspamd Redis Setup
+Suite Teardown Rspamd Redis Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/multimap.conf
-${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
-${UTF_MESSAGE} ${RSPAMD_TESTDIR}/messages/utf.eml
-${REDIS_SCOPE} Suite
-${RSPAMD_SCOPE} Suite
-${RCVD1} ${RSPAMD_TESTDIR}/messages/received1.eml
-${RCVD2} ${RSPAMD_TESTDIR}/messages/received2.eml
-${RCVD3} ${RSPAMD_TESTDIR}/messages/received3.eml
-${RCVD4} ${RSPAMD_TESTDIR}/messages/received4.eml
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
-${URL1} ${RSPAMD_TESTDIR}/messages/url1.eml
-${URL2} ${RSPAMD_TESTDIR}/messages/url2.eml
-${URL3} ${RSPAMD_TESTDIR}/messages/url3.eml
-${URL4} ${RSPAMD_TESTDIR}/messages/url4.eml
-${URL5} ${RSPAMD_TESTDIR}/messages/url5.eml
-${FREEMAIL_CC} ${RSPAMD_TESTDIR}/messages/freemailcc.eml
-${URL_ICS} ${RSPAMD_TESTDIR}/messages/ics.eml
+${CONFIG} ${RSPAMD_TESTDIR}/configs/multimap.conf
+${FREEMAIL_CC} ${RSPAMD_TESTDIR}/messages/freemailcc.eml
+${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
+${RCVD1} ${RSPAMD_TESTDIR}/messages/received1.eml
+${RCVD2} ${RSPAMD_TESTDIR}/messages/received2.eml
+${RCVD3} ${RSPAMD_TESTDIR}/messages/received3.eml
+${RCVD4} ${RSPAMD_TESTDIR}/messages/received4.eml
+${REDIS_SCOPE} Suite
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${URL1} ${RSPAMD_TESTDIR}/messages/url1.eml
+${URL2} ${RSPAMD_TESTDIR}/messages/url2.eml
+${URL3} ${RSPAMD_TESTDIR}/messages/url3.eml
+${URL4} ${RSPAMD_TESTDIR}/messages/url4.eml
+${URL5} ${RSPAMD_TESTDIR}/messages/url5.eml
+${URL_ICS} ${RSPAMD_TESTDIR}/messages/ics.eml
+${UTF_MESSAGE} ${RSPAMD_TESTDIR}/messages/utf.eml
*** Test Cases ***
URL_ICS
@@ -335,12 +335,3 @@ FREEMAIL_CC
MAP - MULTISYMBOL DISABLED
Scan File ${MESSAGE} Rcpt=user3 at example.com
Expect Symbol With Exact Options RCPT_MAP_NOMULTISYM user3 at example.com SYM1
-
-*** Keywords ***
-Multimap Setup
- Run Redis
- New Setup
-
-Multimap Teardown
- Normal Teardown
- Shutdown Process With Children ${REDIS_PID}
diff --git a/test/functional/cases/103_password.robot b/test/functional/cases/103_password.robot
index e40255211..a8dade884 100644
--- a/test/functional/cases/103_password.robot
+++ b/test/functional/cases/103_password.robot
@@ -1,15 +1,15 @@
*** Settings ***
-Test Teardown Normal Teardown
+Test Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/password.conf
-${CONTROLLER_ERRORS} False
-${RSPAMD_SCOPE} Test
-${RSPAMD_PBKDF_PASSWORD} "$1$rhzzahtm8a5homdhh7z4qiiy7j8pzp4u$k5toro136brshjjuy9t39r785td69qodmd39qzygxuyehn9tqauy"
+${CONFIG} ${RSPAMD_TESTDIR}/configs/password.conf
+${CONTROLLER_ERRORS} False
${RSPAMD_CATENA_PASSWORD} "$2$xu1581gidj5cyp4yjgo68qbj6jz1j8o3$j9yg4k58jy3fj8suijxx9d7pea6a6obtufq9kfenosyq8erm87ky"
+${RSPAMD_PBKDF_PASSWORD} "$1$rhzzahtm8a5homdhh7z4qiiy7j8pzp4u$k5toro136brshjjuy9t39r785td69qodmd39qzygxuyehn9tqauy"
+${RSPAMD_SCOPE} Test
*** Test Cases ***
PASSWORD - PBKDF
@@ -52,4 +52,4 @@ Password Setup
[Arguments] ${RSPAMD_PASSWORD} ${RSPAMD_ENABLE_PASSWORD}=nq2
Set Test Variable ${RSPAMD_PASSWORD}
Set Test Variable ${RSPAMD_ENABLE_PASSWORD}
- New Setup
+ Rspamd Setup
diff --git a/test/functional/cases/104_get_from.robot b/test/functional/cases/104_get_from.robot
index a217df443..84b754f37 100644
--- a/test/functional/cases/104_get_from.robot
+++ b/test/functional/cases/104_get_from.robot
@@ -1,19 +1,18 @@
*** Settings ***
-Suite Setup GetFrom Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/lua_script.conf
-${RSPAMD_LUA_SCRIPT} ${RSPAMD_TESTDIR}/lua/get_from.lua
-${RSPAMD_SCOPE} Suite
-
-${SYMBOL} GET_FROM
-${OPTIONS1} ,user at example.org,user,example.org
-${OPTIONS2} First Last,user at example.org,user,example.org
-${OPTIONS3} First M. Last,user at example.org,user,example.org
+${CONFIG} ${RSPAMD_TESTDIR}/configs/lua_script.conf
+${OPTIONS1} ,user at example.org,user,example.org
+${OPTIONS2} First Last,user at example.org,user,example.org
+${OPTIONS3} First M. Last,user at example.org,user,example.org
+${RSPAMD_LUA_SCRIPT} ${RSPAMD_TESTDIR}/lua/get_from.lua
+${RSPAMD_SCOPE} Suite
+${SYMBOL} GET_FROM
*** Test Cases ***
task:get_from('mime') - address only
@@ -51,7 +50,3 @@ task:get_from('mime') - quoted in the middle of DN (outer spaces)
task:get_from('mime') - quoted in the middle of DN (inner spaces)
Scan File ${RSPAMD_TESTDIR}/messages/from/from_quoted_dn_middle_inner.eml
Expect Symbol With Exact Options ${SYMBOL} ${OPTIONS3}
-
-*** Keywords ***
-GetFrom Setup
- New Setup
diff --git a/test/functional/cases/105_mimetypes.robot b/test/functional/cases/105_mimetypes.robot
index d27fd19f0..aa344aebd 100644
--- a/test/functional/cases/105_mimetypes.robot
+++ b/test/functional/cases/105_mimetypes.robot
@@ -1,14 +1,14 @@
*** Settings ***
-Suite Setup MIMETypes Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/mime_types.conf
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/mime_types.conf
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
*** Test Cases ***
Zip
@@ -64,7 +64,3 @@ Exe file, but name in filename_whitelist
Empty text part should not be treat as html
Scan File ${RSPAMD_TESTDIR}/messages/empty-plain-text.eml
Do Not Expect Symbol FORGED_OUTLOOK_HTML
-
-*** Keywords ***
-MIMETypes Setup
- New Setup
diff --git a/test/functional/cases/106_mid.robot b/test/functional/cases/106_mid.robot
index 1933213d8..a42b098aa 100644
--- a/test/functional/cases/106_mid.robot
+++ b/test/functional/cases/106_mid.robot
@@ -1,14 +1,14 @@
*** Settings ***
-Suite Setup New Setup
-Suite Teardown Normal Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/mid.conf
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/mid.conf
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
*** Test Cases ***
MID - invalid Message-ID
diff --git a/test/functional/cases/108_settings.robot b/test/functional/cases/108_settings.robot
index 5f2180ef4..e7f4213a5 100644
--- a/test/functional/cases/108_settings.robot
+++ b/test/functional/cases/108_settings.robot
@@ -6,17 +6,17 @@ Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/settings.conf
-${RSPAMD_LUA_SCRIPT} ${RSPAMD_TESTDIR}/lua/settings.lua
-${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
-${MESSAGE_PRIORITY} ${RSPAMD_TESTDIR}/messages/priority.eml
-${MESSAGE_7BIT} ${RSPAMD_TESTDIR}/messages/utf.eml
-${MESSAGE_CUSTOM_HDR} ${RSPAMD_TESTDIR}/messages/empty-plain-text.eml
-${MESSAGE_ABSENT_MIME} ${RSPAMD_TESTDIR}/messages/ed25519.eml
-${SPAM_MESSAGE} ${RSPAMD_TESTDIR}/messages/spam.eml
-${HAM_MESSAGE} ${RSPAMD_TESTDIR}/messages/ham.eml
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/settings.conf
+${HAM_MESSAGE} ${RSPAMD_TESTDIR}/messages/ham.eml
+${MESSAGE_7BIT} ${RSPAMD_TESTDIR}/messages/utf.eml
+${MESSAGE_ABSENT_MIME} ${RSPAMD_TESTDIR}/messages/ed25519.eml
+${MESSAGE_CUSTOM_HDR} ${RSPAMD_TESTDIR}/messages/empty-plain-text.eml
+${MESSAGE_PRIORITY} ${RSPAMD_TESTDIR}/messages/priority.eml
+${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
+${RSPAMD_LUA_SCRIPT} ${RSPAMD_TESTDIR}/lua/settings.lua
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${SPAM_MESSAGE} ${RSPAMD_TESTDIR}/messages/spam.eml
*** Keywords ***
Check Everything Disabled
@@ -255,8 +255,8 @@ PRIORITY
Settings Setup
Copy File ${RSPAMD_TESTDIR}/data/bayes.spam.sqlite3 /tmp/bayes.spam.sqlite3
Copy File ${RSPAMD_TESTDIR}/data/bayes.ham.sqlite3 /tmp/bayes.ham.sqlite3
- New Setup
+ Rspamd Setup
Settings Teardown
- Normal Teardown
+ Rspamd Teardown
Remove Files /tmp/bayes.spam.sqlite3 /tmp/bayes.ham.sqlite3
diff --git a/test/functional/cases/109_composites.robot b/test/functional/cases/109_composites.robot
index 4dac8cd24..4d73cf4e8 100644
--- a/test/functional/cases/109_composites.robot
+++ b/test/functional/cases/109_composites.robot
@@ -1,15 +1,15 @@
*** Settings ***
-Suite Setup Composites Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/composites.conf
-${RSPAMD_LUA_SCRIPT} ${RSPAMD_TESTDIR}/lua/composites.lua
-${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
-${RSPAMD_SCOPE} Suite
+${CONFIG} ${RSPAMD_TESTDIR}/configs/composites.conf
+${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml
+${RSPAMD_LUA_SCRIPT} ${RSPAMD_TESTDIR}/lua/composites.lua
+${RSPAMD_SCOPE} Suite
*** Test Cases ***
Composites - All in One
@@ -76,7 +76,3 @@ Composites - Opts RE Hit 3
Expect Symbol With Score SYMOPTS4 6.00
Do Not Expect Symbol SYMOPTS2
Do Not Expect Symbol SYMOPTS1
-
-*** Keywords ***
-Composites Setup
- New Setup
diff --git a/test/functional/cases/110_statistics/lib.robot b/test/functional/cases/110_statistics/lib.robot
index 5df8b40f8..794a05952 100644
--- a/test/functional/cases/110_statistics/lib.robot
+++ b/test/functional/cases/110_statistics/lib.robot
@@ -4,15 +4,15 @@ Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/stats.conf
-${MESSAGE_SPAM} ${RSPAMD_TESTDIR}/messages/spam_message.eml
-${MESSAGE_HAM} ${RSPAMD_TESTDIR}/messages/ham.eml
-${REDIS_SCOPE} Suite
-${RSPAMD_REDIS_SERVER} null
-${RSPAMD_SCOPE} Suite
+${CONFIG} ${RSPAMD_TESTDIR}/configs/stats.conf
+${MESSAGE_HAM} ${RSPAMD_TESTDIR}/messages/ham.eml
+${MESSAGE_SPAM} ${RSPAMD_TESTDIR}/messages/spam_message.eml
+${REDIS_SCOPE} Suite
+${RSPAMD_REDIS_SERVER} null
+${RSPAMD_SCOPE} Suite
${RSPAMD_STATS_BACKEND} redis
-${RSPAMD_STATS_HASH} null
-${RSPAMD_STATS_KEY} null
+${RSPAMD_STATS_HASH} null
+${RSPAMD_STATS_KEY} null
*** Keywords ***
Broken Learn Test
@@ -45,10 +45,3 @@ Relearn Test
${pass} = Run Keyword And Return Status Expect Symbol BAYES_HAM
Run Keyword If ${pass} Pass Execution What Me Worry
Do Not Expect Symbol BAYES_SPAM
-
-Redis Statistics Setup
- Run Redis
- 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 b85ae589c..d889502ef 100644
--- a/test/functional/cases/110_statistics/redis-keyed-siphash.robot
+++ b/test/functional/cases/110_statistics/redis-keyed-siphash.robot
@@ -1,12 +1,12 @@
*** Settings ***
-Suite Setup Redis Statistics Setup
-Suite Teardown Redis Statistics Teardown
+Suite Setup Rspamd Redis Setup
+Suite Teardown Rspamd Redis Teardown
Resource lib.robot
*** Variables ***
${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT}
-${RSPAMD_STATS_HASH} siphash
-${RSPAMD_STATS_KEY} ${RSPAMD_KEY_PVT1}
+${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 f62d6bbd9..928a9ea14 100644
--- a/test/functional/cases/110_statistics/redis-keyed-xxhash.robot
+++ b/test/functional/cases/110_statistics/redis-keyed-xxhash.robot
@@ -1,12 +1,12 @@
*** Settings ***
-Suite Setup Redis Statistics Setup
-Suite Teardown Redis Statistics Teardown
+Suite Setup Rspamd Redis Setup
+Suite Teardown Rspamd Redis Teardown
Resource lib.robot
*** Variables ***
${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT}
-${RSPAMD_STATS_HASH} xxhash
-${RSPAMD_STATS_KEY} ${RSPAMD_KEY_PVT1}
+${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 99a5baf18..790a63eab 100644
--- a/test/functional/cases/110_statistics/redis-plain-siphash.robot
+++ b/test/functional/cases/110_statistics/redis-plain-siphash.robot
@@ -1,11 +1,11 @@
*** Settings ***
-Suite Setup Redis Statistics Setup
-Suite Teardown Redis Statistics Teardown
+Suite Setup Rspamd Redis Setup
+Suite Teardown Rspamd Redis Teardown
Resource lib.robot
*** Variables ***
${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT}
-${RSPAMD_STATS_HASH} siphash
+${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 755ccfb89..55e7524a3 100644
--- a/test/functional/cases/110_statistics/redis-plain-xxhash.robot
+++ b/test/functional/cases/110_statistics/redis-plain-xxhash.robot
@@ -1,11 +1,11 @@
*** Settings ***
-Suite Setup Redis Statistics Setup
-Suite Teardown Redis Statistics Teardown
+Suite Setup Rspamd Redis Setup
+Suite Teardown Rspamd Redis Teardown
Resource lib.robot
*** Variables ***
${RSPAMD_REDIS_SERVER} ${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT}
-${RSPAMD_STATS_HASH} xxhash
+${RSPAMD_STATS_HASH} xxhash
*** Test Cases ***
Learn
diff --git a/test/functional/cases/114_phishing.robot b/test/functional/cases/114_phishing.robot
index 732abc0cd..4bb54895b 100644
--- a/test/functional/cases/114_phishing.robot
+++ b/test/functional/cases/114_phishing.robot
@@ -1,17 +1,17 @@
*** Settings ***
-Suite Setup Phishing Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/phishing.conf
-${MESSAGE1} ${RSPAMD_TESTDIR}/messages/phishing1.eml
-${MESSAGE2} ${RSPAMD_TESTDIR}/messages/phishing2.eml
-${MESSAGE3} ${RSPAMD_TESTDIR}/messages/phishing3.eml
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/phishing.conf
+${MESSAGE1} ${RSPAMD_TESTDIR}/messages/phishing1.eml
+${MESSAGE2} ${RSPAMD_TESTDIR}/messages/phishing2.eml
+${MESSAGE3} ${RSPAMD_TESTDIR}/messages/phishing3.eml
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
*** Test Cases ***
TEST PHISHING
@@ -25,7 +25,3 @@ TEST PHISHING STRICT ONE
TEST PHISHING STRICT TWO
Scan File ${MESSAGE3}
Expect Symbol STRICTER_PHISHING
-
-*** Keywords ***
-Phishing Setup
- New Setup
diff --git a/test/functional/cases/115_dmarc.robot b/test/functional/cases/115_dmarc.robot
index 1da083001..d0ba8c72d 100644
--- a/test/functional/cases/115_dmarc.robot
+++ b/test/functional/cases/115_dmarc.robot
@@ -1,14 +1,14 @@
*** Settings ***
-Suite Setup DMARC Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/dmarc.conf
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/dmarc.conf
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
*** Test Cases ***
DMARC NONE PASS DKIM
@@ -86,7 +86,3 @@ DMARC PCT ZERO SP QUARANTINE
Scan File ${RSPAMD_TESTDIR}/messages/dmarc/pct_none1.eml
... IP=37.48.67.26 From=foo at mom.za.org
Expect Symbol DMARC_POLICY_SOFTFAIL
-
-*** Keywords ***
-DMARC Setup
- New Setup
diff --git a/test/functional/cases/116_dkim.robot b/test/functional/cases/116_dkim.robot
index 926f9aeb4..782648fe8 100644
--- a/test/functional/cases/116_dkim.robot
+++ b/test/functional/cases/116_dkim.robot
@@ -1,14 +1,14 @@
*** Settings ***
-Suite Setup DKIM Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/dkim.conf
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/dkim.conf
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
*** Test Cases ***
DKIM PERMFAIL NXDOMAIN
@@ -51,7 +51,3 @@ DKIM Verify ED25519 PASS
DKIM Verify ED25519 REJECT
Scan File ${RSPAMD_TESTDIR}/messages/ed25519-broken.eml
Expect Symbol R_DKIM_REJECT
-
-*** Keywords ***
-DKIM Setup
- New Setup
diff --git a/test/functional/cases/117_spf.robot b/test/functional/cases/117_spf.robot
index c83fb4d13..1887089ef 100644
--- a/test/functional/cases/117_spf.robot
+++ b/test/functional/cases/117_spf.robot
@@ -1,14 +1,14 @@
*** Settings ***
-Suite Setup SPF Setup
-Suite Teardown Simple Teardown
+Suite Setup Rspamd Setup
+Suite Teardown Rspamd Teardown
Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
-${CONFIG} ${RSPAMD_TESTDIR}/configs/dmarc.conf
-${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
+${CONFIG} ${RSPAMD_TESTDIR}/configs/dmarc.conf
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
*** Test Cases ***
SPF FAIL UNRESOLVEABLE INCLUDE
@@ -135,7 +135,3 @@ SPF UPPERCASE
Scan File ${RSPAMD_TESTDIR}/messages/dmarc/bad_dkim1.eml
... IP=8.8.8.8 From=x at fail11.org.org.za
Expect Symbol R_SPF_ALLOW
-
-*** Keywords ***
-SPF Setup
- New Setup
diff --git a/test/functional/cases/120_fuzzy/encrypted.robot b/test/functional/cases/120_fuzzy/encrypted.robot
index 8268b234b..548ea8cb9 100644
--- a/test/functional/cases/120_fuzzy/encrypted.robot
+++ b/test/functional/cases/120_fuzzy/encrypted.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Encrypted Siphash
-Suite Teardown Fuzzy Teardown
+Suite Teardown Rspamd Redis Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/fasthash-keyed.robot b/test/functional/cases/120_fuzzy/fasthash-keyed.robot
index 8f949fceb..6add33d69 100644
--- a/test/functional/cases/120_fuzzy/fasthash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/fasthash-keyed.robot
*** OUTPUT TRUNCATED, 1822 LINES SKIPPED ***
More information about the Commits
mailing list