commit 04040d9: Merge pull request #3747 from fatalbanana/use_settings

[GitHub]

Author: Vsevolod Stakhov
Date: 2021-05-18 13:19:16 +0100
URL: https://github.com/rspamd/rspamd/commit/04040d9336fbcfe9450a2de6c1c7aee6414fcec0 (HEAD -> master)

Merge pull request #3747 from fatalbanana/use_settings
even further updates for tests

 .../cases/{ => 001_merged}/100_general.robot       |  17 +-
 test/functional/cases/001_merged/101_lua.robot     |  41 +++++
 .../cases/{ => 001_merged}/102_multimap.robot      |  77 +++++++-
 .../cases/{ => 001_merged}/104_get_from.robot      |  15 +-
 .../cases/{ => 001_merged}/105_mimetypes.robot     |  18 +-
 .../cases/{ => 001_merged}/106_mid.robot           |  14 +-
 .../cases/{ => 001_merged}/114_phishing.robot      |  15 +-
 .../cases/{ => 001_merged}/115_dmarc.robot         |  23 ++-
 .../cases/{ => 001_merged}/117_spf.robot           |  32 +++-
 .../cases/{ => 001_merged}/160_antivirus.robot     |  27 ++-
 test/functional/cases/001_merged/220_http.robot    |  77 ++++++++
 .../cases/{ => 001_merged}/230_tcp.robot           |  22 +--
 .../functional/cases/001_merged/231_tcp_down.robot |  21 +++
 .../cases/{ => 001_merged}/240_redis.robot         |  12 +-
 .../cases/{ => 001_merged}/250_dns.robot           |  10 +-
 .../cases/{ => 001_merged}/270_selector.robot      |   8 +-
 .../cases/{ => 001_merged}/280_rules.robot         |  33 ++--
 .../cases/{ => 001_merged}/281_fnames.robot        |  10 +-
 .../cases/{ => 001_merged}/290_greylist.robot      |  12 +-
 .../cases/{ => 001_merged}/300_rbl.robot           |  17 +-
 .../cases/{ => 001_merged}/310_udp.robot           |  10 +-
 .../cases/{ => 001_merged}/321_arc_check.robot     |   8 +-
 .../cases/{ => 001_merged}/340_surbl.robot         |  36 +++-
 .../cases/{ => 001_merged}/350_magic.robot         |   9 +-
 test/functional/cases/001_merged/__init__.robot    |  14 ++
 test/functional/cases/101_lua.robot                |  58 ------
 test/functional/cases/220_http.robot               |  68 -------
 test/functional/cases/231_tcp_down.robot           |  31 ----
 test/functional/cases/241_redis_is_dead.robot      |   1 -
 test/functional/cases/260_regex.robot              |   5 +
 test/functional/configs/antivirus.conf             |  43 -----
 test/functional/configs/arc.conf                   |   3 -
 test/functional/configs/dmarc.conf                 |   8 -
 test/functional/configs/greylist.conf              |  13 --
 .../configs/{plugins.conf => merged-local.conf}    | 205 +++++++++++++++++----
 .../{multimap.conf => merged-override.conf}        | 197 ++++++++++++++++++--
 test/functional/configs/merged.conf                |  41 +++++
 test/functional/configs/mid.conf                   |  11 --
 test/functional/configs/mime_types.conf            |  21 ---
 test/functional/configs/phishing.conf              |  13 --
 test/functional/configs/rbl.conf                   |  77 --------
 test/functional/configs/selector.conf              |  10 -
 test/functional/configs/surbl.conf                 |  93 ----------
 test/functional/lib/rspamd.robot                   |   5 +
 test/functional/lua/get_from.lua                   |   8 +-
 test/functional/lua/http.lua                       |   6 +-
 test/functional/lua/maps_kv.lua                    |   6 +-
 47 files changed, 845 insertions(+), 656 deletions(-)