[Test] Fix more tests

diff --git a/test/functional/cases/116_dkim.robot b/test/functional/cases/116_dkim.robot
index 3693588388d45f7c9f4c30a38f920a47d8d8f46d..e710f659d27eb9fef8b74db2290e6d5d94d67719 100644 (file)
--- 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 0519fafa0f9d7e5d720e6859ef9733a253874938..10b712dff055013b22ddc51ee5b3527285b02c41 100644 (file)
--- 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 8068003e8025abfdb78dbbf9b4e8bb38752587ec..e5c765ba0c88864c72a5e54a419bad74853642c4 100644 (file)
--- 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