From 03cf7aff97c45a3fdbae75da0d7596cef9578a81 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Fri, 8 Dec 2017 15:40:21 +0200 Subject: [Test] Redis key expansion & antivirus ordered patterns --- test/functional/cases/160_antivirus.robot | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'test/functional/cases/160_antivirus.robot') 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} -- cgit v1.2.3