diff options
| author | Carsten Rosenberg <c.rosenberg@heinlein-support.de> | 2019-01-19 08:02:51 +0100 |
|---|---|---|
| committer | Carsten Rosenberg <c.rosenberg@heinlein-support.de> | 2019-01-19 08:02:51 +0100 |
| commit | ee587bdf28e581d6b998f334ebb38d408e6b7af1 (patch) | |
| tree | 3b563ea23fbc5c3d1d50665690c042f843dfbe7c /test | |
| parent | 7b4a3195897f7e3b4e01ba01ef02c2fc74a9f904 (diff) | |
| download | rspamd-ee587bdf28e581d6b998f334ebb38d408e6b7af1.tar.gz rspamd-ee587bdf28e581d6b998f334ebb38d408e6b7af1.zip | |
[Fix] tests - antivirus - fprot symbols
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/cases/160_antivirus.robot | 12 | ||||
| -rw-r--r-- | test/functional/configs/antivirus.conf | 16 | ||||
| -rw-r--r-- | test/functional/lib/vars.py | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/test/functional/cases/160_antivirus.robot b/test/functional/cases/160_antivirus.robot index 8f82abf29..c34121dfd 100644 --- a/test/functional/cases/160_antivirus.robot +++ b/test/functional/cases/160_antivirus.robot @@ -47,14 +47,14 @@ FPROT MISS FPROT HIT - PATTERN Run Dummy Fprot ${PORT_FPROT} 1 - Run Dummy Fprot ${PORT_FPROT_DUPLICATE} 1 /tmp/dummy_fprot_dupe.pid + Run Dummy Fprot ${PORT_FPROT2_DUPLICATE} 1 /tmp/dummy_fprot_dupe.pid ${result} = Scan Message With Rspamc ${MESSAGE} 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 - Should Not Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_DEFAULT - Should Not Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_NOPE + Should Contain ${result.stdout} FPROT2_VIRUS_DUPLICATE_PATTERN + Should Not Contain ${result.stdout} FPROT2_VIRUS_DUPLICATE_DEFAULT + Should Not Contain ${result.stdout} FPROT2_VIRUS_DUPLICATE_NOPE Shutdown fport Shutdown fport duplicate @@ -63,8 +63,8 @@ FPROT CACHE HIT 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 - Should Not Contain ${result.stdout} FPROT_VIRUS_DUPLICATE_DEFAULT + Should Contain ${result.stdout} FPROT2_VIRUS_DUPLICATE_PATTERN + Should Not Contain ${result.stdout} FPROT2_VIRUS_DUPLICATE_DEFAULT FPROT CACHE MISS ${result} = Scan Message With Rspamc ${MESSAGE2} diff --git a/test/functional/configs/antivirus.conf b/test/functional/configs/antivirus.conf index 432d9a2de..9aba7bb64 100644 --- a/test/functional/configs/antivirus.conf +++ b/test/functional/configs/antivirus.conf @@ -20,16 +20,16 @@ antivirus { fprot_duplicate { prefix = "fp_dupe"; attachments_only = false; - symbol = "FPROT_VIRUS_DUPLICATE_DEFAULT"; + symbol = "FPROT2_VIRUS_DUPLICATE_DEFAULT"; type = "fprot"; - servers = "127.0.0.1:${PORT_FPROT_DUPLICATE}"; + servers = "127.0.0.1:${PORT_FPROT2_DUPLICATE}"; patterns = [ - {FPROT_VIRUS_DUPLICATE_PATTERN = "^E"}, - {FPROT_VIRUS_DUPLICATE_NOPE1 = "^EI", - FPROT_VIRUS_DUPLICATE_NOPE2 = "^EIC", - FPROT_VIRUS_DUPLICATE_NOPE3 = "^EICA", - FPROT_VIRUS_DUPLICATE_NOPE4 = "^EICAR", - FPROT_VIRUS_DUPLICATE_NOPE5 = "^EICAR_"} + {FPROT2_VIRUS_DUPLICATE_PATTERN = "^E"}, + {FPROT2_VIRUS_DUPLICATE_NOPE1 = "^EI", + FPROT2_VIRUS_DUPLICATE_NOPE2 = "^EIC", + FPROT2_VIRUS_DUPLICATE_NOPE3 = "^EICA", + FPROT2_VIRUS_DUPLICATE_NOPE4 = "^EICAR", + FPROT2_VIRUS_DUPLICATE_NOPE5 = "^EICAR_"} ]; } } diff --git a/test/functional/lib/vars.py b/test/functional/lib/vars.py index e707480a8..97b53b2e1 100644 --- a/test/functional/lib/vars.py +++ b/test/functional/lib/vars.py @@ -14,7 +14,7 @@ PORT_NORMAL_SLAVE = 56794 PORT_PROXY = 56795 PORT_CLAM = 56796 PORT_FPROT = 56797 -PORT_FPROT_DUPLICATE = 56798 +PORT_FPROT2_DUPLICATE = 56798 REDIS_ADDR = u'127.0.0.1' REDIS_PORT = 56379 NGINX_ADDR = u'127.0.0.1' |