commit 388a019: [Test] Eliminate stupid global variables

Vsevolod Stakhov vsevolod at highsecure.ru
Tue Sep 10 14:07:07 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-09-10 15:01:30 +0100
URL: https://github.com/rspamd/rspamd/commit/388a019efdb78dbea5a7045ea3100ed58def81d3 (HEAD -> master)

[Test] Eliminate stupid global variables

---
 test/functional/cases/220_http.robot     | 2 +-
 test/functional/cases/230_tcp.robot      | 2 +-
 test/functional/cases/231_tcp_down.robot | 2 +-
 test/functional/cases/250_dns.robot      | 2 +-
 test/functional/cases/310_udp.robot      | 2 +-
 test/functional/cases/350_magic.robot    | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/functional/cases/220_http.robot b/test/functional/cases/220_http.robot
index acdb75431..c30fbba9c 100644
--- a/test/functional/cases/220_http.robot
+++ b/test/functional/cases/220_http.robot
@@ -42,7 +42,7 @@ SSL Large HTTP request
 *** Keywords ***
 Lua Setup
   [Arguments]  ${LUA_SCRIPT}
-  Set Global Variable  ${LUA_SCRIPT}
+  Set Suite Variable  ${LUA_SCRIPT}
   Generic Setup
 
 Http Setup
diff --git a/test/functional/cases/230_tcp.robot b/test/functional/cases/230_tcp.robot
index b5801dba0..51f590ea4 100644
--- a/test/functional/cases/230_tcp.robot
+++ b/test/functional/cases/230_tcp.robot
@@ -47,7 +47,7 @@ Sync API TCP post request
 *** Keywords ***
 Lua Setup
   [Arguments]  ${LUA_SCRIPT}
-  Set Global Variable  ${LUA_SCRIPT}
+  Set Suite Variable  ${LUA_SCRIPT}
   Generic Setup
 
 Servers Setup
diff --git a/test/functional/cases/231_tcp_down.robot b/test/functional/cases/231_tcp_down.robot
index f852724ad..10043024f 100644
--- a/test/functional/cases/231_tcp_down.robot
+++ b/test/functional/cases/231_tcp_down.robot
@@ -25,7 +25,7 @@ Sync API TCP get request when server is down
 *** Keywords ***
 Lua Setup
   [Arguments]  ${LUA_SCRIPT}
-  Set Global Variable  ${LUA_SCRIPT}
+  Set Suite Variable  ${LUA_SCRIPT}
   Generic Setup
 
 Http Setup
diff --git a/test/functional/cases/250_dns.robot b/test/functional/cases/250_dns.robot
index c19f473e9..050c6c29e 100644
--- a/test/functional/cases/250_dns.robot
+++ b/test/functional/cases/250_dns.robot
@@ -26,7 +26,7 @@ Faulty DNS request
 *** Keywords ***
 Lua Setup
   [Arguments]  ${LUA_SCRIPT}
-  Set Global Variable  ${LUA_SCRIPT}
+  Set Suite Variable  ${LUA_SCRIPT}
   Generic Setup
 
 Http Setup
diff --git a/test/functional/cases/310_udp.robot b/test/functional/cases/310_udp.robot
index 2ecd1cfb8..ee20d4ea5 100644
--- a/test/functional/cases/310_udp.robot
+++ b/test/functional/cases/310_udp.robot
@@ -28,7 +28,7 @@ Errored UDP request
 *** Keywords ***
 Lua Setup
   [Arguments]  ${LUA_SCRIPT}
-  Set Global Variable  ${LUA_SCRIPT}
+  Set Suite Variable  ${LUA_SCRIPT}
   Generic Setup
 
 UDP Setup
diff --git a/test/functional/cases/350_magic.robot b/test/functional/cases/350_magic.robot
index 877b6e88e..8d3bdbef8 100644
--- a/test/functional/cases/350_magic.robot
+++ b/test/functional/cases/350_magic.robot
@@ -16,4 +16,5 @@ Magic detections bundle 1
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/gargantua.eml
   Follow Rspamd Log
   Should Contain  ${result.stdout}  MAGIC_SYM_ZIP_2
-  Should Contain  ${result.stdout}  MAGIC_SYM_RAR_3
\ No newline at end of file
+  Should Contain  ${result.stdout}  MAGIC_SYM_RAR_3
+


More information about the Commits mailing list