commit 3396fdd: Merge remote-tracking branch 'upstream/master'

[korgoth1]

Author: korgoth1
Date: 2020-06-25 22:41:41 +0300
URL: https://github.com/rspamd/rspamd/commit/3396fddc22d38730ececc26fbdbab0c1d0445a26 (refs/pull/3413/head)

Merge remote-tracking branch 'upstream/master'


 .drone.yml                                         |   4 +-
 test/functional/cases/100_general.robot            |   7 +-
 test/functional/cases/101_lua.robot                |   1 -
 test/functional/cases/120_fuzzy/lib.robot          |   6 +-
 .../cases/131_dkim_signing/006_milter.robot        |   1 -
 test/functional/cases/140_proxy.robot              |   8 --
 test/functional/cases/180_milter.robot             |   1 -
 test/functional/cases/220_http.robot               |   5 +-
 test/functional/cases/230_tcp.robot                |   5 +-
 test/functional/cases/231_tcp_down.robot           |   5 +-
 test/functional/cases/330_neural.robot             |  22 ++--
 test/functional/cases/350_magic.robot              |   1 -
 test/functional/lib/rspamd.py                      | 113 ++++-----------------
 test/functional/lib/rspamd.robot                   |  41 ++------
 test/functional/lib/vars.py                        |   6 +-
 test/functional/util/dummy_avast.py                |  12 +--
 test/functional/util/dummy_clam.py                 |  12 +--
 test/functional/util/dummy_fprot.py                |  15 ++-
 test/functional/util/dummy_http.py                 |  33 +++---
 test/functional/util/dummy_https.py                |  38 +++----
 test/functional/util/dummy_p0f.py                  |  24 ++---
 test/functional/util/dummy_ssl.py                  |  56 +++++-----
 test/functional/util/dummy_udp.py                  |   7 +-
 23 files changed, 143 insertions(+), 280 deletions(-)