aboutsummaryrefslogtreecommitdiffstats
path: root/test/functional/configs
diff options
context:
space:
mode:
authorAndrew Lewis <nerf@judo.za.org>2021-05-24 16:33:20 +0200
committerAndrew Lewis <nerf@judo.za.org>2021-06-01 15:59:19 +0200
commit89ecb1b26baa4a9d511d7fe6a50c8bc8414b5ed0 (patch)
tree0ac863007ae9356b28f11cc97afa9f098c0940e8 /test/functional/configs
parent9c12fd9609b1af6da35178987b9f1033b02757bc (diff)
downloadrspamd-89ecb1b26baa4a9d511d7fe6a50c8bc8414b5ed0.tar.gz
rspamd-89ecb1b26baa4a9d511d7fe6a50c8bc8414b5ed0.zip
[Test] Unmerge http / tcp tests
Diffstat (limited to 'test/functional/configs')
-rw-r--r--test/functional/configs/merged-local.conf16
-rw-r--r--test/functional/configs/merged.conf6
2 files changed, 16 insertions, 6 deletions
diff --git a/test/functional/configs/merged-local.conf b/test/functional/configs/merged-local.conf
index 466003703..84bffe8dd 100644
--- a/test/functional/configs/merged-local.conf
+++ b/test/functional/configs/merged-local.conf
@@ -1,3 +1,19 @@
+history_redis {
+ enabled = false;
+}
+
+neural {
+ enabled = false;
+}
+
+bayes_expiry {
+ enabled = false;
+}
+
+metric_exporter {
+ enabled = false;
+}
+
emails {
"whitelist" = [
"rspamd-test.com"
diff --git a/test/functional/configs/merged.conf b/test/functional/configs/merged.conf
index 132461d90..8bec67a41 100644
--- a/test/functional/configs/merged.conf
+++ b/test/functional/configs/merged.conf
@@ -13,12 +13,6 @@ lua = "{= env.TESTDIR =}/lua/tlds.lua"
# 104_get_from
lua = "{= env.TESTDIR =}/lua/get_from.lua"
-# 220_http
-lua = "{= env.TESTDIR =}/lua/http.lua"
-
-# 230_tcp / 231_tcp_down
-lua = "{= env.TESTDIR =}/lua/tcp.lua"
-
# 240_redis
lua = "{= env.TESTDIR =}/lua/redis.lua"