From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 29 Sep 2018 16:26:14 +0000 (+0100)
Subject: [Test] Fix AV tests
X-Git-Tag: 1.8.1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e19bd185b0615b2cec23aea3024537d1cf0ecc;p=thirdparty%2Frspamd.git

[Test] Fix AV tests
---

diff --git a/test/functional/cases/160_antivirus.robot b/test/functional/cases/160_antivirus.robot
index 86c2e51b03..bdbd7456f2 100644
--- a/test/functional/cases/160_antivirus.robot
+++ b/test/functional/cases/160_antivirus.robot
@@ -24,13 +24,13 @@ CLAMAV MISS
 CLAMAV HIT
   Run Dummy Clam  ${PORT_CLAM}  1
   ${result} =  Scan Message With Rspamc  ${MESSAGE2}
-  Check Rspamc  ${result}  CLAM_VIRUS (1.00)[Eicar-Test-Signature]
+  Check Rspamc  ${result}  CLAM_VIRUS
   Should Not Contain  ${result.stdout}  CLAMAV_FAIL
   Shutdown clamav
 
 CLAMAV CACHE HIT
   ${result} =  Scan Message With Rspamc  ${MESSAGE2}
-  Check Rspamc  ${result}  CLAM_VIRUS (1.00)[Eicar-Test-Signature]
+  Check Rspamc  ${result}  CLAM_VIRUS
   Should Not Contain  ${result.stdout}  CLAMAV_FAIL
 
 CLAMAV CACHE MISS
@@ -49,7 +49,7 @@ 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]
+  Check Rspamc  ${result}  FPROT_EICAR
   Should Not Contain  ${result.stdout}  CLAMAV_VIRUS
   # Also check ordered pattern match
   Should Contain  ${result.stdout}  FPROT_VIRUS_DUPLICATE_PATTERN
@@ -60,7 +60,7 @@ FPROT HIT - PATTERN
 
 FPROT CACHE HIT
   ${result} =  Scan Message With Rspamc  ${MESSAGE}
-  Check Rspamc  ${result}  FPROT_EICAR (1.00)[EICAR_Test_File]
+  Check Rspamc  ${result}  FPROT_EICAR
   Should Not Contain  ${result.stdout}  CLAMAV_VIRUS
   # Also check ordered pattern match
   Should Contain  ${result.stdout}  FPROT_VIRUS_DUPLICATE_PATTERN