aboutsummaryrefslogtreecommitdiffstats
path: root/test/functional/cases/160_antivirus.robot
diff options
context:
space:
mode:
authorAndrew Lewis <nerf@judo.za.org>2017-12-08 15:40:21 +0200
committerAndrew Lewis <nerf@judo.za.org>2017-12-08 15:40:21 +0200
commit03cf7aff97c45a3fdbae75da0d7596cef9578a81 (patch)
treec6e6c356b44b8b78e44692d18c46d2ed13ca19fa /test/functional/cases/160_antivirus.robot
parent09f3015da643b82e24b054f1704aa6783bfc79e8 (diff)
downloadrspamd-03cf7aff97c45a3fdbae75da0d7596cef9578a81.tar.gz
rspamd-03cf7aff97c45a3fdbae75da0d7596cef9578a81.zip
[Test] Redis key expansion & antivirus ordered patterns
Diffstat (limited to 'test/functional/cases/160_antivirus.robot')
-rw-r--r--test/functional/cases/160_antivirus.robot14
1 files changed, 11 insertions, 3 deletions
diff --git a/test/functional/cases/160_antivirus.robot b/test/functional/cases/160_antivirus.robot
index ec43329e3..edc063445 100644
--- a/test/functional/cases/160_antivirus.robot
+++ b/test/functional/cases/160_antivirus.robot
@@ -44,14 +44,22 @@ FPROT MISS
FPROT HIT - PATTERN
Run Dummy Fprot ${PORT_FPROT} 1
+ Run Dummy Fprot ${PORT_FPROT_DUPLICATE} 1 /tmp/dummy_fprot_dupe.pid
${result} = Scan Message With Rspamc ${MESSAGE}
Check Rspamc ${result} FPROT_EICAR (1.00)[EICAR_Test_File]
Should Not Contain ${result.stdout} CLAMAV_VIRUS
+ # Also check ordered pattern match
+ Should Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_PATTERN
+ Should Not Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_DEFAULT
+ Should Not Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_NOPE
FPROT CACHE HIT
${result} = Scan Message With Rspamc ${MESSAGE}
Check Rspamc ${result} FPROT_EICAR (1.00)[EICAR_Test_File]
Should Not Contain ${result.stdout} CLAMAV_VIRUS
+ # Also check ordered pattern match
+ Should Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_PATTERN
+ Should Not Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_DEFAULT
FPROT CACHE MISS
${result} = Scan Message With Rspamc ${MESSAGE2}
@@ -74,6 +82,6 @@ Run Dummy Clam
Wait Until Created /tmp/dummy_clamav.pid
Run Dummy Fprot
- [Arguments] ${port} ${found}=
- ${result} = Start Process ${TESTDIR}/util/dummy_fprot.py ${port} ${found}
- Wait Until Created /tmp/dummy_fprot.pid
+ [Arguments] ${port} ${found}= ${pid}=/tmp/dummy_fprot.pid
+ ${result} = Start Process ${TESTDIR}/util/dummy_fprot.py ${port} ${found} ${pid}
+ Wait Until Created ${pid}