summaryrefslogtreecommitdiffstats
path: root/test/lua
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2019-08-19 09:45:28 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2019-08-19 09:45:28 +0100
commit58a5e0c7039af50b0607c5f4aee8648d1d560cdc (patch)
treea6407ee5c71f6cae23e017ea619f79fd122c8c82 /test/lua
parent76a3ba9cdff99c6b7de8ac4334a7955f80a7361b (diff)
downloadrspamd-58a5e0c7039af50b0607c5f4aee8648d1d560cdc.tar.gz
rspamd-58a5e0c7039af50b0607c5f4aee8648d1d560cdc.zip
[Rework] Reorganise selectors implementation
Diffstat (limited to 'test/lua')
-rw-r--r--test/lua/unit/selectors.combined.lua14
-rw-r--r--test/lua/unit/selectors.negative.lua4
2 files changed, 9 insertions, 9 deletions
diff --git a/test/lua/unit/selectors.combined.lua b/test/lua/unit/selectors.combined.lua
index d70caeb10..06c5c0fca 100644
--- a/test/lua/unit/selectors.combined.lua
+++ b/test/lua/unit/selectors.combined.lua
@@ -33,25 +33,25 @@ context("Selectors test", function()
local cases = {
["rcpts + weekend"] = {
- selector = "rcpts:addr.take_n(5).lower;time('message', '!%w').in(6, 7).id('weekends')",
+ selector = "rcpts:addr.take_n(5).lower;time('message', '!%w').in(6, 7).id('weekends')",
expect = {
- "nobody@example.com:weekends",
+ "nobody@example.com:weekends",
"no-one@example.com:weekends"}},
["weekend + rcpts"] = {
- selector = "time('message', '!%w').in(6, 7).id('weekends');rcpts:addr.take_n(5).lower",
+ selector = "time('message', '!%w').in(6, 7).id('weekends');rcpts:addr.take_n(5).lower",
expect = {
- "weekends:nobody@example.com",
+ "weekends:nobody@example.com",
"weekends:no-one@example.com"}},
["id(rcpt) + rcpts + weekend"] = {
- selector = "id('rcpt');rcpts:addr.take_n(5).lower;time('message', '!%w').in(6, 7).id('weekends')",
+ selector = "id('rcpt');rcpts:addr.take_n(5).lower;time('message', '!%w').in(6, 7).id('weekends')",
expect = {
"rcpt:nobody@example.com:weekends",
"rcpt:no-one@example.com:weekends"}},
["id(rcpt) + id(2) rcpts + weekend"] = {
- selector = "id('rcpt'); id(2); rcpts:addr.take_n(5).lower; time('message', '!%w').in(6, 7).id('weekends')",
+ selector = "id('rcpt'); id(2); rcpts:addr.take_n(5).lower; time('message', '!%w').in(6, 7).id('weekends')",
expect = {
"rcpt:2:nobody@example.com:weekends",
"rcpt:2:no-one@example.com:weekends"}},
@@ -59,7 +59,7 @@ context("Selectors test", function()
-- There are two rcpts but only one url in the message
-- resulting table size is the size of the smallest table
["id(rcpt) + id(2) + rcpts and urls + weekend"] = {
- selector = "id('rcpt'); id(2); rcpts:addr.take_n(5).lower; id('urls'); urls:get_host; time('message', '!%w').in(6, 7).id('weekends')",
+ selector = "id('rcpt'); id(2); rcpts:addr.take_n(5).lower; id('urls'); urls:get_host; time('message', '!%w').in(6, 7).id('weekends')",
expect = {
"rcpt:2:nobody@example.com:urls:example.net:weekends"}},
}
diff --git a/test/lua/unit/selectors.negative.lua b/test/lua/unit/selectors.negative.lua
index c7d3f1e7a..426240066 100644
--- a/test/lua/unit/selectors.negative.lua
+++ b/test/lua/unit/selectors.negative.lua
@@ -5,9 +5,9 @@ context("Selectors test", function()
local lua_selectors = require "lua_selectors"
local ffi = require "ffi"
local cfg = rspamd_config
-
+
local task
-
+
ffi.cdef[[
void rspamd_url_init (const char *tld_file);
]]