From ad797afed513439cb2cd81de185b75880ea9f8aa Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Sat, 2 Jul 2016 17:48:58 +0200
Subject: [Test] Add & rework functional tests

 - Machine formatted test data
 - More idiomatic use of test framework
 - Added tests for fuzzy & redis statistics
---
 test/functional/configs/stats.conf | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'test/functional/configs/stats.conf')

diff --git a/test/functional/configs/stats.conf b/test/functional/configs/stats.conf
index 144b7a886..216d7d8f3 100644
--- a/test/functional/configs/stats.conf
+++ b/test/functional/configs/stats.conf
@@ -21,8 +21,8 @@ worker {
 	bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL}
 	count = 1
 	keypair {
-		pubkey = "${KEY_PUBLIC}";
-		privkey = "${KEY_PRIVATE}";
+		pubkey = "${KEY_PUB1}";
+		privkey = "${KEY_PVT1}";
 	}
 }
 worker {
@@ -30,8 +30,8 @@ worker {
 	bind_socket = ${LOCAL_ADDR}:${PORT_CONTROLLER}
 	count = 1
 	keypair {
-		pubkey = "${KEY_PUBLIC}";
-		privkey = "${KEY_PRIVATE}";
+		pubkey = "${KEY_PUB1}";
+		privkey = "${KEY_PVT1}";
 	}
 	secure_ip = ["127.0.0.1", "::1"];
 }
@@ -40,26 +40,26 @@ classifier {
 	languages_enabled = true;
 	tokenizer {
 		name = "osb";
-		hash = ${STATS_HASH}
-		key = ${STATS_KEY}
+		${STATS_HASH}
+		${STATS_KEY}
 	}
 	backend = ${STATS_BACKEND}
 	statfile {
 		symbol = BAYES_SPAM;
-		path = ${STATSDIR}/rspamd-bats-bayes.spam;
+		${STATS_PATH_SPAM}
 		size = 1M;
-		write_servers = ${REDIS_SERVER}
+		${REDIS_SERVER}
 	}
 	statfile {
 		symbol = BAYES_HAM;
-		path = ${STATSDIR}/rspamd-bats-bayes.ham;
+		${STATS_PATH_HAM}
 		size = 1M;
-		write_servers = ${REDIS_SERVER}
+		${REDIS_SERVER}
 	}
 
 	cache {
-		path = ${STATSDIR}/rspamd-bats-cache.sqlite;
-		write_servers = ${REDIS_SERVER}
+		${STATS_PATH_CACHE}
+		${REDIS_SERVER}
 	}
 }
 
-- 
cgit v1.2.3