commit e837c9b: [Test] Fix http tests - remove coroutines tests

Vsevolod Stakhov vsevolod at highsecure.ru
Thu Feb 28 20:14:04 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-02-28 20:00:27 +0000
URL: https://github.com/rspamd/rspamd/commit/e837c9b7b510ee9eb51bca79a800f3813698baa2

[Test] Fix http tests - remove coroutines tests

---
 test/functional/cases/220_http.robot | 16 ++++++++--------
 test/functional/lua/http.lua         |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/functional/cases/220_http.robot b/test/functional/cases/220_http.robot
index b4292897e..7166b2a56 100644
--- a/test/functional/cases/220_http.robot
+++ b/test/functional/cases/220_http.robot
@@ -15,25 +15,25 @@ ${RSPAMD_SCOPE}  Test
 
 *** Test Cases ***
 Simple HTTP request
-  Check url  /request  get  HTTP_DNS_200  HTTP_200  HTTP_CORO_DNS_200  HTTP_CORO_200  method_get  hello world  HTTP_CORO_200 (0.00)[hello world]
-  Check url  /request  post  HTTP_DNS_200  HTTP_200  HTTP_CORO_DNS_200  HTTP_CORO_200  method_post  hello post  HTTP_CORO_DNS_200 (0.00)[hello post]
+  Check url  /request  get  HTTP_DNS_200  HTTP_200  method_get  hello world
+  Check url  /request  post  HTTP_DNS_200  HTTP_200  method_post  hello post
 
 *** Test Cases ***
 HTTP request 403
-  Check url  /error_403  get  HTTP_DNS_403  HTTP_403  HTTP_CORO_DNS_403  HTTP_CORO_403  method_get
-  Check url  /error_403  post  HTTP_DNS_403  HTTP_403  HTTP_CORO_DNS_403  HTTP_CORO_403  method_post
+  Check url  /error_403  get  HTTP_DNS_403  HTTP_403  method_get
+  Check url  /error_403  post  HTTP_DNS_403  HTTP_403  method_post
 
 
 *** Test Cases ***
 HTTP timeout
-  Check url  /timeout  get  HTTP_ERROR  HTTP_ERROR  HTTP_CORO_DNS_ERROR  HTTP_CORO_ERROR  method_get  IO timeout
-  Check url  /timeout  post  HTTP_DNS_ERROR  HTTP_ERROR  HTTP_CORO_DNS_ERROR  HTTP_CORO_ERROR  method_post  IO timeout
+  Check url  /timeout  get  HTTP_ERROR  HTTP_ERROR  method_get  IO timeout
+  Check url  /timeout  post  HTTP_DNS_ERROR  HTTP_ERROR  method_post  IO timeout
 
 
 *** Test Cases ***
 HTTP empty response
-  Check url  /empty  get  HTTP_ERROR  HTTP_ERROR  HTTP_CORO_DNS_ERROR  HTTP_CORO_ERROR  method_get  IO read error: unexpected EOF
-  Check url  /empty  post  HTTP_DNS_ERROR  HTTP_ERROR  HTTP_CORO_DNS_ERROR  HTTP_CORO_ERROR  method_post  IO read error: unexpected EOF
+  Check url  /empty  get  HTTP_ERROR  HTTP_ERROR  method_get  IO read error: unexpected EOF
+  Check url  /empty  post  HTTP_DNS_ERROR  HTTP_ERROR  method_post  IO read error: unexpected EOF
 
 
 *** Keywords ***
diff --git a/test/functional/lua/http.lua b/test/functional/lua/http.lua
index 0263beb6f..a433a9d93 100644
--- a/test/functional/lua/http.lua
+++ b/test/functional/lua/http.lua
@@ -43,7 +43,7 @@ local function http_symbol(task)
     callback = http_dns_callback,
     timeout = 1,
   })
-
+--[[
   rspamd_logger.errx(task, 'rspamd_http.request[before]')
 
   local err, response = rspamd_http.request({
@@ -73,6 +73,7 @@ local function http_symbol(task)
   else
     task:insert_result('HTTP_CORO_DNS_ERROR', 1.0, err)
   end
+  --]]
 end
 
 


More information about the Commits mailing list