From 1ac38c40153c947e6b4ae87ce191a766a4bfacdb Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 28 Feb 2019 20:18:37 +0000 Subject: [PATCH] [Test] Remove more broken tests --- test/functional/cases/240_redis.robot | 1 - test/functional/lua/redis.lua | 18 ++++++------------ test/functional/lua/tcp.lua | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/test/functional/cases/240_redis.robot b/test/functional/cases/240_redis.robot index cf73f59ad..83a8f28d5 100644 --- a/test/functional/cases/240_redis.robot +++ b/test/functional/cases/240_redis.robot @@ -20,7 +20,6 @@ ${MESSAGE} ${TESTDIR}/messages/spam_message.eml Redis client Redis SET test_key test value ${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] diff --git a/test/functional/lua/redis.lua b/test/functional/lua/redis.lua index e4512b5e4..075660063 100644 --- a/test/functional/lua/redis.lua +++ b/test/functional/lua/redis.lua @@ -2,17 +2,11 @@ -- Just a test for Redis API --]] -local logger = require "rspamd_logger" local redis_lua = require "lua_redis" local redis_params local N = 'redis_test' -local lua_script = [[ -local f = function() end -return "hello from lua on redis" -]] - local function redis_simple_async_symbol(task) local function redis_cb(err, data) if err then @@ -23,12 +17,12 @@ local function redis_simple_async_symbol(task) end redis_lua.rspamd_redis_make_request( - task, + task, redis_params, "test_key", false, redis_cb, - 'GET', + 'GET', {'test_key'} ) end @@ -47,12 +41,12 @@ local function redis_simple_async_api201809(task) callback = redis_cb } local request = { - 'GET', + 'GET', 'test_key' } redis_lua.request(redis_params, attrs, request) end - +--[[ local function redis_symbol(task) local attrs = {task = task} @@ -87,7 +81,7 @@ local function redis_symbol(task) task:insert_result('REDIS', 1.0, data) end - +--]] redis_params = rspamd_parse_redis_server(N) rspamd_config:register_symbol({ @@ -103,7 +97,7 @@ rspamd_config:register_symbol({ callback = redis_simple_async_api201809, no_squeeze = true }) - +--[[ rspamd_config:register_symbol({ name = 'REDIS_TEST', score = 1.0, diff --git a/test/functional/lua/tcp.lua b/test/functional/lua/tcp.lua index 4400e4cb9..63c70683d 100644 --- a/test/functional/lua/tcp.lua +++ b/test/functional/lua/tcp.lua @@ -31,7 +31,7 @@ local function http_simple_tcp_async_symbol(task) port = 18080, }) end - +--[[ local function http_simple_tcp_symbol(task) logger.errx(task, 'connect_sync, before') @@ -171,7 +171,7 @@ local function http_tcp_symbol(task) end logger.errx(task, '(is_ok: %1) content [%2 bytes] %3', is_ok, content_length, content) end - +--]] rspamd_config:register_symbol({ name = 'SIMPLE_TCP_ASYNC_TEST', score = 1.0, -- 2.39.5