diff options
author | Andrew Lewis <nerf@judo.za.org> | 2021-05-05 00:42:11 +0200 |
---|---|---|
committer | Andrew Lewis <nerf@judo.za.org> | 2021-05-05 00:42:11 +0200 |
commit | 5569dbacfc83c42e68e8668d065707023212c6eb (patch) | |
tree | 498574bfcd327d206ce4fae74ad7cb69220c8095 /test/functional/cases/280_rules.robot | |
parent | a84cecac6bef1211cf8ab245d997b6ac64b6686a (diff) | |
download | rspamd-5569dbacfc83c42e68e8668d065707023212c6eb.tar.gz rspamd-5569dbacfc83c42e68e8668d065707023212c6eb.zip |
[Test] Cleanup
- Use consistent naming for setup/teardown
- Remove some unused files
- Sort & align variables
Diffstat (limited to 'test/functional/cases/280_rules.robot')
-rw-r--r-- | test/functional/cases/280_rules.robot | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/test/functional/cases/280_rules.robot b/test/functional/cases/280_rules.robot index a64af6f71..fe0efa357 100644 --- a/test/functional/cases/280_rules.robot +++ b/test/functional/cases/280_rules.robot @@ -1,23 +1,23 @@ *** Settings *** -Suite Setup Rules Setup -Suite Teardown Rules 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/regexp.conf -${MESSAGE} ${RSPAMD_TESTDIR}/messages/newlines.eml -${MESSAGE1} ${RSPAMD_TESTDIR}/messages/fws_fn.eml -${MESSAGE2} ${RSPAMD_TESTDIR}/messages/fws_fp.eml -${MESSAGE3} ${RSPAMD_TESTDIR}/messages/fws_tp.eml -${MESSAGE4} ${RSPAMD_TESTDIR}/messages/broken_richtext.eml -${MESSAGE5} ${RSPAMD_TESTDIR}/messages/badboundary.eml -${MESSAGE6} ${RSPAMD_TESTDIR}/messages/pdf_encrypted.eml -${MESSAGE7} ${RSPAMD_TESTDIR}/messages/pdf_js.eml -${MESSAGE8} ${RSPAMD_TESTDIR}/messages/yand_forward.eml -${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat -${RSPAMD_SCOPE} Suite +${CONFIG} ${RSPAMD_TESTDIR}/configs/regexp.conf +${MESSAGE1} ${RSPAMD_TESTDIR}/messages/fws_fn.eml +${MESSAGE2} ${RSPAMD_TESTDIR}/messages/fws_fp.eml +${MESSAGE3} ${RSPAMD_TESTDIR}/messages/fws_tp.eml +${MESSAGE4} ${RSPAMD_TESTDIR}/messages/broken_richtext.eml +${MESSAGE5} ${RSPAMD_TESTDIR}/messages/badboundary.eml +${MESSAGE6} ${RSPAMD_TESTDIR}/messages/pdf_encrypted.eml +${MESSAGE7} ${RSPAMD_TESTDIR}/messages/pdf_js.eml +${MESSAGE8} ${RSPAMD_TESTDIR}/messages/yand_forward.eml +${MESSAGE} ${RSPAMD_TESTDIR}/messages/newlines.eml +${RSPAMD_SCOPE} Suite +${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat *** Test Cases *** @@ -114,10 +114,3 @@ REPLYTO_ADDR_EQ_FROM Scan File ${RSPAMD_TESTDIR}/messages/replyto_addr_eq_from.eml Expect Symbol REPLYTO_ADDR_EQ_FROM - -*** Keywords *** -Rules Setup - New Setup - -Rules Teardown - Normal Teardown |