[Test] Cleanup

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

3 files changed, 0 insertions, 64 deletions

diff --git a/test/functional/configs/fuzzy_master_worker.conf b/test/functional/configs/fuzzy_master_worker.conf
deleted file mode 100644
index 37c238d8d..000000000
--- a/test/functional/configs/fuzzy_master_worker.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-sync_keypair {
-	pubkey = "kmtnjffjzq9bq8qe14ii4gb4e1ihuq84ubfibe79ba85ob5nr3my";
-	privkey = "ea6etw8a47e66ypc38mmdnrwskx7nj86gqydwo7jrmfsxeryny1y";
-	id = "6jxoadfy8gr6dq1nyafoa5ym3391sioz3fbbq5qug7g9dchmgjr4w4kxjzqkkc9rzd7eftngyzwau9ooqe9g96bxiwq6c3xo8965gud";
-	encoding = "base32";
-	algorithm = "curve25519";
-}
-slave {
-	name = "slave1";
-        hosts = "${RSPAMD_LOCAL_ADDR}:${PORT_FUZZY_SLAVE}";
-	key = "caen11q4eczdqgsb8u55zmmoh4z5qxd61y1rph7pz1fcubmfccdy";
-}
diff --git a/test/functional/configs/fuzzy_slave_worker.conf b/test/functional/configs/fuzzy_slave_worker.conf
deleted file mode 100644
index 353a5def6..000000000
--- a/test/functional/configs/fuzzy_slave_worker.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-sync_keypair {
-	pubkey = "caen11q4eczdqgsb8u55zmmoh4z5qxd61y1rph7pz1fcubmfccdy";
-	privkey = "oi4k9g9prsqmk19xio7itaobmbz7yonktren1j5qwni1t88mwfty";
-	id = "qdwzxmoxpno4ge68ba1ai35n65q7mrqdp8dpp33h8haxy61omt881mep4944w1n6izuk64ktypqymrq55zkx3qob1ayfz9hxjtxbmxb";
-	encoding = "base32";
-	algorithm = "curve25519";
-	type = "kex";
-}
-
-masters = "${RSPAMD_LOCAL_ADDR}";
-master_key = "kmtnjffjzq9bq8qe14ii4gb4e1ihuq84ubfibe79ba85ob5nr3my";
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}