aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2022-12-31 16:46:20 +0000
committerVsevolod Stakhov <vsevolod@rspamd.com>2022-12-31 16:46:20 +0000
commit39047bb22e66bf46f2e8919ffabec0108e8049b0 (patch)
tree39fbdfde7d60428e48e9140f54c2cf5d8126ee0e /test
parent9df22a9472b884802ac1a5b1c80859f2770b1a41 (diff)
downloadrspamd-39047bb22e66bf46f2e8919ffabec0108e8049b0.tar.gz
rspamd-39047bb22e66bf46f2e8919ffabec0108e8049b0.zip
[Test] Fix more tests
Diffstat (limited to 'test')
-rw-r--r--test/functional/cases/116_dkim.robot2
-rw-r--r--test/functional/cases/162_url_redirector.robot2
-rw-r--r--test/functional/lua/tcp.lua5
3 files changed, 4 insertions, 5 deletions
diff --git a/test/functional/cases/116_dkim.robot b/test/functional/cases/116_dkim.robot
index 369358838..e710f659d 100644
--- a/test/functional/cases/116_dkim.robot
+++ b/test/functional/cases/116_dkim.robot
@@ -8,7 +8,7 @@ Variables ${RSPAMD_TESTDIR}/lib/vars.py
*** Variables ***
${CONFIG} ${RSPAMD_TESTDIR}/configs/dkim.conf
${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
*** Test Cases ***
DKIM PERMFAIL NXDOMAIN
diff --git a/test/functional/cases/162_url_redirector.robot b/test/functional/cases/162_url_redirector.robot
index 0519fafa0..10b712dff 100644
--- a/test/functional/cases/162_url_redirector.robot
+++ b/test/functional/cases/162_url_redirector.robot
@@ -11,7 +11,7 @@ ${CONFIG} ${RSPAMD_TESTDIR}/configs/url_redirector.conf
${MESSAGE} ${RSPAMD_TESTDIR}/messages/redir.eml
${REDIS_SCOPE} Suite
${RSPAMD_SCOPE} Suite
-${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../../contrib/publicsuffix/effective_tld_names.dat
+${RSPAMD_URL_TLD} ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
${SETTINGS} {symbols_enabled=[URL_REDIRECTOR_CHECK]}
*** Test Cases ***
diff --git a/test/functional/lua/tcp.lua b/test/functional/lua/tcp.lua
index 8068003e8..e5c765ba0 100644
--- a/test/functional/lua/tcp.lua
+++ b/test/functional/lua/tcp.lua
@@ -122,7 +122,7 @@ local function http_simple_tcp_symbol(task)
logger.errx(task, 'connect_sync %1, %2', is_ok, tostring(connection))
- is_ok, err = connection:write('GET /request_sync HTTP/1.1\r\nConnection: keep-alive\r\n\r\n')
+ is_ok, err = connection:write('GET /request HTTP/1.1\r\nConnection: keep-alive\r\n\r\n')
logger.errx(task, 'write %1, %2', is_ok, err)
if not is_ok then
@@ -149,7 +149,7 @@ local function http_simple_tcp_symbol(task)
task:insert_result('HTTP_SYNC_RESPONSE', 1.0, got_content)
- is_ok, err = connection:write("POST /request2 HTTP/1.1\r\n\r\n")
+ is_ok, err = connection:write("POST /request HTTP/1.1\r\n\r\n")
logger.errx(task, 'write[2] %1, %2', is_ok, err)
got_content = ''
@@ -163,7 +163,6 @@ local function http_simple_tcp_symbol(task)
got_content = got_content .. data
end
if got_content:find('hello') then
- -- dummy_http.py responds with either hello world or hello post
break
end
until false