[Test] Added test for new version of Redis API

diff --git a/test/functional/cases/240_redis.robot b/test/functional/cases/240_redis.robot
index 70798a96bb8982b98c449203b1eaa8b3967bca5f..cf73f59ad3432d19c1176f47a71849372bdad718 100644 (file)
--- a/test/functional/cases/240_redis.robot
+++ b/test/functional/cases/240_redis.robot
@@ -22,6 +22,7 @@ Redis client
   ${result} =  Scan Message With Rspamc  ${MESSAGE}
   Check Rspamc  ${result}  REDIS (0.00)[hello from lua on redis]
   Check Rspamc  ${result}  REDIS_ASYNC (0.00)[test value]
+  Check Rspamc  ${result}  REDIS_ASYNC201809 (0.00)[test value]
 
 *** Keywords ***
 Lua Setup

diff --git a/test/functional/cases/241_redis_is_dead.robot b/test/functional/cases/241_redis_is_dead.robot
index e23a241204e2d2ee1c95961b7e5b6b71d2752068..0577ef03fee98c3d1bb45f07a0b23a4eaddaecfb 100644 (file)
--- a/test/functional/cases/241_redis_is_dead.robot
+++ b/test/functional/cases/241_redis_is_dead.robot
@@ -22,6 +22,8 @@ ${MESSAGE}      ${TESTDIR}/messages/spam_message.eml
 Dead Redis client
   ${result} =  Scan Message With Rspamc  ${MESSAGE}
   Check Rspamc  ${result}  REDIS_ERROR_3 (0.00)[Connection refused]
+  Check Rspamc  ${result}  REDIS_ASYNC201809_ERROR (0.00)[Connection refused]
+  Check Rspamc  ${result}  REDIS_ASYNC_ERROR (0.00)[Connection refused]
 
 *** Keywords ***
 Lua Setup

diff --git a/test/functional/lua/redis.lua b/test/functional/lua/redis.lua
index 841b207872f25aca3c25368186bc815e093187e9..a9cf9ed7861f4d1383eb1561469724c55d016ecd 100644 (file)
--- a/test/functional/lua/redis.lua
+++ b/test/functional/lua/redis.lua
@@ -34,11 +34,30 @@ local function redis_simple_async_symbol(task)
   )
 end
 
+local function redis_simple_async_api201809(task)
+  local function redis_cb(err, data)
+    if err then
+      task:insert_result('REDIS_ASYNC201809_ERROR', 1.0, err)
+    else
+      task:insert_result('REDIS_ASYNC201809', 1.0, data)
+    end
+  end
+
+  local attrs = {
+    task = task,
+    callback = redis_cb
+  }
+  local request = {
+    'GET', 
+    'test_key'
+  }
+  redis_lua.request(redis_params, attrs, request)
+end
+
 local function redis_symbol(task)
 
-  local params = lua_util.deepcopy(redis_params)
-  params.task = task
-  local is_ok, connection = redis_lua.redis_connect_sync(params)
+  local attrs = {task = task}
+  local is_ok, connection = redis_lua.connect(redis_params, attrs)
 
   logger.infox(task, "connect: %1, %2", is_ok, connection)
 
@@ -79,6 +98,13 @@ rspamd_config:register_symbol({
   no_squeeze = true
 })
 
+rspamd_config:register_symbol({
+  name = 'SIMPLE_REDIS_ASYNC201809_TEST',
+  score = 1.0,
+  callback = redis_simple_async_api201809,
+  no_squeeze = true
+})
+
 rspamd_config:register_symbol({
   name = 'REDIS_TEST',
   score = 1.0,