[Test] Fix stats_path

diff --git a/circle.yml b/circle.yml
index 2ecec8713a27f98b0fd9419b44d5b1ecd39f1335..6aa8555e8c433975d1b266f3fb6f1dbaa222f87b 100644 (file)
--- a/circle.yml
+++ b/circle.yml
@@ -8,7 +8,7 @@ dependencies:
 test:
   override:
     - mkdir ../build ; mkdir ../install ; cd ../build
-    - cmake ../rspamd -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install
+    - cmake ../rspamd -DDBDIR=/nana -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install
     - make install
     - RSPAMADM=../install/bin/rspamadm RSPAMC=../install/bin/rspamc RSPAMD=../install/bin/rspamd sudo -E robot ../rspamd/test/functional/cases
     - lcov --no-external -b ../rspamd -d ../rspamd -c --output-file coverage.info

diff --git a/test/functional/configs/fuzzy.conf b/test/functional/configs/fuzzy.conf
index fcd744f924055c708f9b9446a589a99ab8d4c823..deb518f4c26a1e39a3b4a1a40f28124e64530388 100644 (file)
--- a/test/functional/configs/fuzzy.conf
+++ b/test/functional/configs/fuzzy.conf
@@ -35,6 +35,7 @@ worker {
         bind_socket = "${LOCAL_ADDR}:${PORT_CONTROLLER}";
         count = 1
         secure_ip = ["${LOCAL_ADDR}"];
+       stats_path = "${TMPDIR}/stats.ucl";
 }
 
 worker {

diff --git a/test/functional/configs/lua_test.conf b/test/functional/configs/lua_test.conf
index 6e93f85ac4cac0c464d452897febf68560a40bea..a485de4a621f89003f860d975ee69e1e1549afdf 100644 (file)
--- a/test/functional/configs/lua_test.conf
+++ b/test/functional/configs/lua_test.conf
@@ -26,6 +26,7 @@ worker {
        bind_socket = ${LOCAL_ADDR}:${PORT_CONTROLLER}
        count = 1
        secure_ip = ["127.0.0.1", "::1"];
+       stats_path = "${TMPDIR}/stats.ucl"
 }
 
 lua = ${LUA_SCRIPT};

diff --git a/test/functional/configs/password.conf b/test/functional/configs/password.conf
index 96688e996ae56e0fa1ec5e2fd18cf1dacd8e2732..0280cc6f865cf7df4ba0799399a569a8f5b59e79 100644 (file)
--- a/test/functional/configs/password.conf
+++ b/test/functional/configs/password.conf
@@ -35,4 +35,5 @@ worker {
        }
        password = ${PASSWORD};
        enable_password = ${ENABLE_PASSWORD};
-}
\ No newline at end of file
+       stats_path = "${TMPDIR}/stats.ucl";
+}

diff --git a/test/functional/configs/stats.conf b/test/functional/configs/stats.conf
index 6c2893022cd93e557b77b4854e7a4980c53be219..7e50d24b0f191f96c557eebb39136441faa7cc0e 100644 (file)
--- a/test/functional/configs/stats.conf
+++ b/test/functional/configs/stats.conf
@@ -34,6 +34,7 @@ worker {
                privkey = "${KEY_PVT1}";
        }
        secure_ip = ["127.0.0.1", "::1"];
+       stats_path = "${TMPDIR}/stats.ucl";
 }
 
 classifier {

diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index 7ec79ce6e3613ebddc1a7ee20b56ec329380b123..438aeb1bc732bd276c566bde25b7ce08239e9f8e 100644 (file)
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -109,7 +109,7 @@ Run Rspamd
   Log  ${config}
   Create File  ${tmpdir}/rspamd.conf  ${config}
   ${result} =  Run Process  ${RSPAMD}  -u  ${RSPAMD_USER}  -g  ${RSPAMD_GROUP}
-  ...  -c  ${tmpdir}/rspamd.conf  DBDIR\=${tmpdir}  env:TMPDIR=${tmpdir}  env:LD_LIBRARY_PATH=${TESTDIR}/../../contrib/aho-corasick
+  ...  -c  ${tmpdir}/rspamd.conf  env:TMPDIR=${tmpdir}  env:LD_LIBRARY_PATH=${TESTDIR}/../../contrib/aho-corasick
   Run Keyword If  ${result.rc} != 0  Log  ${result.stderr}
   ${rspamd_logpos} =  Log Logs  ${tmpdir}/rspamd.log  0
   Should Be Equal As Integers  ${result.rc}  0