[Test] Cleanup

 - Use consistent naming for setup/teardown
 - Remove some unused files
 - Sort & align variables

1 files changed, 0 insertions, 41 deletions

diff --git a/test/functional/configs/pluginsplus.conf b/test/functional/configs/pluginsplus.conf
deleted file mode 100644
index 52c7b54a0..000000000
--- a/test/functional/configs/pluginsplus.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-options = {
-	filters = ["spf", "dkim", "regexp"]
-	url_tld = "${RSPAMD_URL_TLD}"
-	pidfile = "${RSPAMD_TMPDIR}/rspamd.pid"
-	lua_path = "${INSTALLROOT}/share/rspamd/lib/?.lua"
-	dns {
-		nameserver = ["8.8.8.8", "8.8.4.4"];
-		retransmits = 10;
-		timeout = 2s;
-	}
-}
-logging = {
-	type = "file",
-	level = "debug"
-	filename = "${RSPAMD_TMPDIR}/rspamd.log"
-}
-metric = {
-	name = "default",
-	actions = {
-		reject = 100500,
-	}
-	unknown_weight = 1
-}
-worker {
-	type = normal
-	bind_socket = ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_NORMAL}
-	count = 1
-	task_timeout = 60s;
-}
-worker {
-        type = controller
-        bind_socket = ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER}
-        count = 1
-        secure_ip = ["127.0.0.1", "::1"];
-        stats_path = "${RSPAMD_TMPDIR}/stats.ucl"
-}
-modules {
-    path = "${RSPAMD_TESTDIR}/../../src/plugins/lua/"
-}
-lua = "${LUA}";
-${PLUGIN_CONFIG}