[Minor] Fix tests

diff --git a/lualib/lua_stat.lua b/lualib/lua_stat.lua
index 21870b27d04718a915a2702b1718ed26f61a1c78..2606a8d22da9bfcdcc0bd089ea9bb53d9c14a671 100644 (file)
--- a/lualib/lua_stat.lua
+++ b/lualib/lua_stat.lua
@@ -519,7 +519,7 @@ exports.redis_classifier_from_sqlite = redis_classifier_from_sqlite
 
 -- Reads statistics config and return preprocessed table
 local function process_stat_config(cfg)
-  local opts_section = cfg:get_all_opt('options')
+  local opts_section = cfg:get_all_opt('options') or {}
 
   -- Check if we have a dedicated section for statistics
   if opts_section.statistics then

diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index b98feb1b2969ce0617f2b1137401451467677168..0e61d6e849ee5b0940abc6341ea596b2560b2698 100644 (file)
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -743,6 +743,11 @@ lua_util_config_from_ucl (lua_State *L)
                        lua_pushnil (L);
                }
                else {
+
+                       if (int_options & RSPAMD_CONFIG_INIT_LIBS) {
+                               cfg->libs_ctx = rspamd_init_libs ();
+                       }
+
                        rspamd_config_post_load (cfg, int_options);
                        pcfg = lua_newuserdata (L, sizeof (struct rspamd_config *));
                        rspamd_lua_setclass (L, "rspamd{config}", -1);

diff --git a/test/rspamd_test_suite.c b/test/rspamd_test_suite.c
index 10a5d941b35dfe19957602c806bb38975c3bca8c..6ca8d646598bb4218ee23e93759741f06f404d71 100644 (file)
--- a/test/rspamd_test_suite.c
+++ b/test/rspamd_test_suite.c
@@ -1,6 +1,7 @@
 #include "config.h"
 #include "rspamd.h"
 #include "libstat/stat_api.h"
+#include "lua/lua_common.h"
 #include "tests.h"
 
 struct rspamd_main             *rspamd_main = NULL;
@@ -31,6 +32,7 @@ main (int argc, char **argv)
        memset (rspamd_main, 0, sizeof (struct rspamd_main));
        rspamd_main->server_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL);
        cfg = rspamd_config_new (RSPAMD_CONFIG_INIT_DEFAULT);
+       cfg->libs_ctx = rspamd_init_libs ();
        rspamd_main->cfg = cfg;
        cfg->cfg_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL);
        cfg->log_type = RSPAMD_LOG_CONSOLE;
@@ -51,8 +53,7 @@ main (int argc, char **argv)
                exit (1);
        }
 
-       cfg->libs_ctx = rspamd_init_libs ();
-
+       rspamd_lua_set_path ((lua_State *)cfg->lua_state, NULL, NULL);
        base = event_init ();
        rspamd_stat_init (cfg, base);
        rspamd_url_init (NULL);