aboutsummaryrefslogtreecommitdiffstats
path: root/test/functional/cases/270_selector.robot
diff options
context:
space:
mode:
authorAndrew Lewis <nerf@judo.za.org>2021-05-05 00:42:11 +0200
committerAndrew Lewis <nerf@judo.za.org>2021-05-05 00:42:11 +0200
commit5569dbacfc83c42e68e8668d065707023212c6eb (patch)
tree498574bfcd327d206ce4fae74ad7cb69220c8095 /test/functional/cases/270_selector.robot
parenta84cecac6bef1211cf8ab245d997b6ac64b6686a (diff)
downloadrspamd-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/270_selector.robot')
-rw-r--r--test/functional/cases/270_selector.robot21
1 files changed, 7 insertions, 14 deletions
diff --git a/test/functional/cases/270_selector.robot b/test/functional/cases/270_selector.robot
index d3a002db8..683d53d0b 100644
--- a/test/functional/cases/270_selector.robot
+++ b/test/functional/cases/270_selector.robot
@@ -1,16 +1,16 @@
*** Settings ***
-Test Setup Regex Setup
-Test Teardown Regex Teardown
+Test Setup Rspamd Setup
+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/selector.conf
-${MESSAGE} ${RSPAMD_TESTDIR}/messages/subject1.eml
-${UTF_MESSAGE} ${RSPAMD_TESTDIR}/messages/utf.eml
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
-${RSPAMD_SCOPE} Suite
+${CONFIG} ${RSPAMD_TESTDIR}/configs/selector.conf
+${MESSAGE} ${RSPAMD_TESTDIR}/messages/subject1.eml
+${RSPAMD_SCOPE} Suite
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${UTF_MESSAGE} ${RSPAMD_TESTDIR}/messages/utf.eml
*** Test Cases ***
@@ -19,10 +19,3 @@ Newlines
Expect Symbol CONFIG_SELECTOR_RE_RCPT_SUBJECT
Expect Symbol LUA_SELECTOR_RE
-
-*** Keywords ***
-Regex Setup
- New Setup
-
-Regex Teardown
- Normal Teardown