commit 49ba9a4: Merge pull request #3734 from fatalbanana/unreplace_variables

GitHub noreply at github.com
Wed May 5 14:07:11 UTC 2021


Author: Vsevolod Stakhov
Date: 2021-05-05 15:03:44 +0100
URL: https://github.com/rspamd/rspamd/commit/49ba9a40c31f1ebac7210a6d4b30c630978f4e87 (HEAD -> master)

Merge pull request #3734 from fatalbanana/unreplace_variables
further test framework updates

 test/functional/cases/100_general.robot            |  28 ++--
 test/functional/cases/101_lua.robot                |  64 +++----
 test/functional/cases/102_multimap.robot           |  55 +++---
 test/functional/cases/103_password.robot           |  54 +++---
 test/functional/cases/104_get_from.robot           |  43 +++--
 test/functional/cases/105_mimetypes.robot          |  46 +++--
 test/functional/cases/106_mid.robot                |  30 ++--
 test/functional/cases/108_settings.robot           |  39 +++--
 test/functional/cases/109_composites.robot         |  22 +--
 test/functional/cases/110_statistics/lib.robot     |  45 ++---
 .../cases/110_statistics/redis-keyed-siphash.robot |  11 +-
 .../cases/110_statistics/redis-keyed-xxhash.robot  |  11 +-
 .../cases/110_statistics/redis-plain-siphash.robot |   9 +-
 .../cases/110_statistics/redis-plain-xxhash.robot  |   9 +-
 test/functional/cases/114_phishing.robot           |  28 ++--
 test/functional/cases/115_dmarc.robot              |  56 +++----
 test/functional/cases/116_dkim.robot               |  38 ++---
 test/functional/cases/117_spf.robot                |  64 ++++---
 test/functional/cases/120_fuzzy/encrypted.robot    |   2 +-
 .../cases/120_fuzzy/fasthash-keyed.robot           |   2 +-
 test/functional/cases/120_fuzzy/fasthash.robot     |   2 +-
 test/functional/cases/120_fuzzy/general.robot      |   2 +-
 test/functional/cases/120_fuzzy/lib.robot          |  96 +++++------
 .../functional/cases/120_fuzzy/mumhash-keyed.robot |   2 +-
 test/functional/cases/120_fuzzy/mumhash.robot      |   2 +-
 .../functional/cases/120_fuzzy/siphash-keyed.robot |   2 +-
 test/functional/cases/120_fuzzy/siphash.robot      |   2 +-
 test/functional/cases/120_fuzzy/xxhash-keyed.robot |   2 +-
 test/functional/cases/120_fuzzy/xxhash.robot       |   2 +-
 test/functional/cases/121_json/100_preresult.robot |  18 +-
 test/functional/cases/121_json/101_simple.robot    |  18 +-
 test/functional/cases/121_json/lib.robot           |   8 +-
 test/functional/cases/123_whitelist.robot          |  36 ++--
 test/functional/cases/125_map_reload.robot         |  32 ++--
 .../cases/131_dkim_signing/001_simple.robot        |  31 ++--
 .../cases/131_dkim_signing/002_redis.robot         |  29 ++--
 .../cases/131_dkim_signing/003_eddsa.robot         |  31 ++--
 .../131_dkim_signing/004_invalidate_key.robot      |  34 ++--
 .../cases/131_dkim_signing/005_multiple.robot      |  31 ++--
 .../cases/131_dkim_signing/006_milter.robot        |  22 ++-
 .../cases/131_dkim_signing/007_sign_maps.robot     |  31 ++--
 test/functional/cases/135_spamassassin.robot       |  28 ++--
 test/functional/cases/140_proxy.robot              |  48 +++---
 test/functional/cases/150_rspamadm.robot           |   4 +-
 test/functional/cases/151_rspamadm_async.robot     |  25 ++-
 test/functional/cases/160_antivirus.robot          |  49 +++---
 test/functional/cases/161_p0f.robot                |  40 ++---
 test/functional/cases/162_url_redirector.robot     |  32 ++--
 test/functional/cases/180_milter.robot             |  22 ++-
 .../cases/210_clickhouse/001_migration.robot       |  54 +++---
 test/functional/cases/220_http.robot               |  29 ++--
 test/functional/cases/230_tcp.robot                |  29 ++--
 test/functional/cases/231_tcp_down.robot           |  31 ++--
 test/functional/cases/240_redis.robot              |  37 ++---
 test/functional/cases/241_redis_is_dead.robot      |  36 ++--
 test/functional/cases/250_dns.robot                |  31 ++--
 test/functional/cases/260_regex.robot              |  30 ++--
 test/functional/cases/270_selector.robot           |  29 ++--
 test/functional/cases/280_rules.robot              |  69 ++++----
 test/functional/cases/281_fnames.robot             |  31 ++--
 test/functional/cases/290_greylist.robot           |  32 ++--
 test/functional/cases/300_rbl.robot                |  40 ++---
 test/functional/cases/310_udp.robot                |  26 ++-
 .../cases/320_arc_signing/001_simple.robot         |  31 ++--
 .../cases/320_arc_signing/002_redis.robot          |  29 ++--
 test/functional/cases/321_arc_check.robot          |  26 ++-
 .../cases/330_neural/001_autotrain.robot           |  31 ++--
 .../cases/330_neural/002_manualtrain.robot         |  39 ++---
 test/functional/cases/340_surbl.robot              |  74 ++++-----
 test/functional/cases/350_magic.robot              | 131 ++++++++-------
 test/functional/cases/360_force_actions.robot      |  28 +---
 test/functional/cases/__init__.robot               |   8 +-
 test/functional/configs/antivirus.conf             |  12 +-
 test/functional/configs/arc.conf                   |   4 +-
 test/functional/configs/arc_signing/redis.conf     |   4 +-
 test/functional/configs/arc_signing/simple.conf    |   4 +-
 test/functional/configs/clickhouse-config.xml      |   8 +-
 test/functional/configs/clickhouse.conf            |  14 +-
 test/functional/configs/composites.conf            |  16 +-
 test/functional/configs/dkim.conf                  |  42 ++---
 test/functional/configs/dkim_signing/eddsa.conf    |   4 +-
 .../configs/dkim_signing/invalidate.conf           |   4 +-
 test/functional/configs/dkim_signing/milter.conf   |  32 ++--
 test/functional/configs/dkim_signing/multiple.conf |   6 +-
 test/functional/configs/dkim_signing/redis.conf    |   4 +-
 .../functional/configs/dkim_signing/sign_maps.conf |   4 +-
 test/functional/configs/dkim_signing/simple.conf   |   4 +-
 test/functional/configs/dmarc.conf                 |   6 +-
 .../functional/configs/empty.conf                  |   0
 test/functional/configs/force_actions.conf         |   4 +-
 test/functional/configs/fuzzy-encryption-key.conf  |   2 +
 test/functional/configs/fuzzy.conf                 |  55 +++---
 test/functional/configs/fuzzy_master_worker.conf   |  12 --
 test/functional/configs/fuzzy_slave_worker.conf    |  11 --
 test/functional/configs/greylist.conf              |   4 +-
 test/functional/configs/lua_script.conf            |  14 +-
 test/functional/configs/lua_test.conf              |  18 +-
 test/functional/configs/mid.conf                   |   6 +-
 test/functional/configs/milter.conf                |  26 +--
 test/functional/configs/mime_types.conf            |   6 +-
 test/functional/configs/multimap.conf              |  48 +++---
 test/functional/configs/neural.conf                |  22 +--
 test/functional/configs/neural_noauto.conf         |  22 +--
 test/functional/configs/nginx.conf                 |   6 +-
 test/functional/configs/p0f.conf                   |   6 +-
 test/functional/configs/password.conf              |  26 +--
 test/functional/configs/phishing.conf              |   6 +-
 test/functional/configs/plugins.conf               |  21 ++-
 test/functional/configs/pluginsplus.conf           |  41 -----
 test/functional/configs/proxy.conf                 |  16 +-
 test/functional/configs/rbl.conf                   |   4 +-
 test/functional/configs/redis-server.conf          |  10 +-
 test/functional/configs/redis.conf                 |   6 +-
 test/functional/configs/regexp.conf                |  18 +-
 test/functional/configs/selector.conf              |   4 +-
 test/functional/configs/settings.conf              |   4 +-
 test/functional/configs/spamassassin.conf          |   8 +-
 test/functional/configs/stats.conf                 |  34 ++--
 test/functional/configs/surbl.conf                 |   6 +-
 test/functional/configs/trivial.conf               |  22 +--
 test/functional/configs/url_redirector.conf        |   6 +-
 test/functional/configs/url_tags.conf              |   2 +-
 test/functional/configs/whitelist.conf             |  16 +-
 test/functional/lib/rspamd.py                      |  10 +-
 test/functional/lib/rspamd.robot                   | 185 ++++++++++++---------
 test/functional/lib/vars.py                        |  40 ++---
 126 files changed, 1420 insertions(+), 1733 deletions(-)


More information about the Commits mailing list