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/290_greylist.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/290_greylist.robot')
| -rw-r--r-- | test/functional/cases/290_greylist.robot | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/test/functional/cases/290_greylist.robot b/test/functional/cases/290_greylist.robot index 27584c907..24385b5d5 100644 --- a/test/functional/cases/290_greylist.robot +++ b/test/functional/cases/290_greylist.robot @@ -1,16 +1,16 @@ *** Settings *** -Suite Setup Greylist Setup -Suite Teardown Greylist 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/greylist.conf -${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml -${REDIS_SCOPE} Suite -${RSPAMD_SCOPE} Suite -${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat +${CONFIG} ${RSPAMD_TESTDIR}/configs/greylist.conf +${MESSAGE} ${RSPAMD_TESTDIR}/messages/spam_message.eml +${REDIS_SCOPE} Suite +${RSPAMD_SCOPE} Suite +${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat *** Test Cases *** GREYLIST NEW @@ -25,13 +25,3 @@ GREYLIST PASS Sleep 4s Wait greylisting timeout Scan File ${MESSAGE} Expect Symbol With Option GREYLIST pass - -*** Keywords *** -Greylist Setup - New Setup - Run Redis - -Greylist Teardown - Normal Teardown - Shutdown Process With Children ${REDIS_PID} - Terminate All Processes kill=True |