diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2016-06-27 21:11:07 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2016-06-27 23:27:26 +0200 |
| commit | e8a7a6327950349aa897ce84e507d4fd94f43834 (patch) | |
| tree | 1185e854673c7e220b56ada9fd4ef714f40bdcaf /test/functional/configs | |
| parent | 3bb4e1cd86c65a854bcfe4e7d0bb0a1c64347fc7 (diff) | |
| download | rspamd-e8a7a6327950349aa897ce84e507d4fd94f43834.tar.gz rspamd-e8a7a6327950349aa897ce84e507d4fd94f43834.zip | |
[Test] New functional test framework
Diffstat (limited to 'test/functional/configs')
| -rw-r--r-- | test/functional/configs/lua_test.conf | 14 | ||||
| -rw-r--r-- | test/functional/configs/stats.conf | 17 | ||||
| -rw-r--r-- | test/functional/configs/trivial.conf | 6 |
3 files changed, 16 insertions, 21 deletions
diff --git a/test/functional/configs/lua_test.conf b/test/functional/configs/lua_test.conf index f43ceb49a..bcb1c3323 100644 --- a/test/functional/configs/lua_test.conf +++ b/test/functional/configs/lua_test.conf @@ -18,22 +18,14 @@ metric = { worker { type = normal - bind_socket = localhost:56789 + bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL} count = 1 - keypair { - pubkey = "y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty"; - privkey = "oswsyqndpj3swqa4yqm4yzoyih83otqkeoxpo9km95o46ixh6quy"; - } } worker { type = controller - bind_socket = localhost:56790 + bind_socket = ${LOCAL_ADDR}:${PORT_CONTROLLER} count = 1 - keypair { - pubkey = "y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty"; - privkey = "oswsyqndpj3swqa4yqm4yzoyih83otqkeoxpo9km95o46ixh6quy"; - } secure_ip = ["127.0.0.1", "::1"]; } -lua = @@LUA_SCRIPT@@; +lua = ${LUA_SCRIPT}; diff --git a/test/functional/configs/stats.conf b/test/functional/configs/stats.conf index 06c1884aa..144b7a886 100644 --- a/test/functional/configs/stats.conf +++ b/test/functional/configs/stats.conf @@ -18,25 +18,26 @@ metric = { worker { type = normal - bind_socket = localhost:56789 + bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL} count = 1 keypair { - pubkey = "y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty"; - privkey = "oswsyqndpj3swqa4yqm4yzoyih83otqkeoxpo9km95o46ixh6quy"; + pubkey = "${KEY_PUBLIC}"; + privkey = "${KEY_PRIVATE}"; } } worker { type = controller - bind_socket = localhost:56790 + bind_socket = ${LOCAL_ADDR}:${PORT_CONTROLLER} count = 1 keypair { - pubkey = "y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty"; - privkey = "oswsyqndpj3swqa4yqm4yzoyih83otqkeoxpo9km95o46ixh6quy"; + pubkey = "${KEY_PUBLIC}"; + privkey = "${KEY_PRIVATE}"; } secure_ip = ["127.0.0.1", "::1"]; } classifier { + languages_enabled = true; tokenizer { name = "osb"; hash = ${STATS_HASH} @@ -47,16 +48,18 @@ classifier { symbol = BAYES_SPAM; path = ${STATSDIR}/rspamd-bats-bayes.spam; size = 1M; + write_servers = ${REDIS_SERVER} } statfile { symbol = BAYES_HAM; path = ${STATSDIR}/rspamd-bats-bayes.ham; size = 1M; + write_servers = ${REDIS_SERVER} } cache { - name = "sqlite3"; path = ${STATSDIR}/rspamd-bats-cache.sqlite; + write_servers = ${REDIS_SERVER} } } diff --git a/test/functional/configs/trivial.conf b/test/functional/configs/trivial.conf index 1233b479b..03fb11e0f 100644 --- a/test/functional/configs/trivial.conf +++ b/test/functional/configs/trivial.conf @@ -18,10 +18,10 @@ metric = { worker { type = normal - bind_socket = localhost:56789 + bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL} count = 1 keypair { - pubkey = "y3ms1knmetxf8gdeixkf74b6tbpxqugmxzqksnjodiqei7tksyty"; - privkey = "oswsyqndpj3swqa4yqm4yzoyih83otqkeoxpo9km95o46ixh6quy"; + pubkey = "${KEY_PUBLIC}"; + privkey = "${KEY_PRIVATE}"; } } |