diff options
| author | Anton Yuzhaninov <citrin+git@citrin.ru> | 2019-06-21 15:54:56 +0200 |
|---|---|---|
| committer | Anton Yuzhaninov <citrin+git@citrin.ru> | 2019-06-21 15:54:56 +0200 |
| commit | 3a43b6c6d72461af4ac72f47c8299e3b96c2c567 (patch) | |
| tree | c3fe3cd408c2d2dfef038d91fbed440a2a58f244 /test/functional/cases | |
| parent | c60133354f2644739e3f456e6f7263a06a466e0d (diff) | |
| download | rspamd-3a43b6c6d72461af4ac72f47c8299e3b96c2c567.tar.gz rspamd-3a43b6c6d72461af4ac72f47c8299e3b96c2c567.zip | |
[Minor] Update test to work with current robot version
Diffstat (limited to 'test/functional/cases')
| -rw-r--r-- | test/functional/cases/104_get_from.robot | 8 | ||||
| -rw-r--r-- | test/functional/cases/120_fuzzy/lib.robot | 41 |
2 files changed, 28 insertions, 21 deletions
diff --git a/test/functional/cases/104_get_from.robot b/test/functional/cases/104_get_from.robot index a81dec559..94f2590a4 100644 --- a/test/functional/cases/104_get_from.robot +++ b/test/functional/cases/104_get_from.robot @@ -11,9 +11,9 @@ ${LUA_SCRIPT} ${TESTDIR}/lua/get_from.lua ${RSPAMD_SCOPE} Suite ${SYMBOL} GET_FROM (0.00) -${SYMBOL1} ${SYMBOL}[,user@example.org,user,example.org] -${SYMBOL2} ${SYMBOL}[First Last,user@example.org,user,example.org] -${SYMBOL3} ${SYMBOL}[First M. Last,user@example.org,user,example.org] +${SYMBOL1} ${SYMBOL}\[,user@example.org,user,example.org] +${SYMBOL2} ${SYMBOL}\[First Last,user@example.org,user,example.org] +${SYMBOL3} ${SYMBOL}\[First M. Last,user@example.org,user,example.org] *** Test Cases *** task:get_from('mime') - address only @@ -30,7 +30,7 @@ task:get_from('mime') - display name task:get_from('mime') - display name Base64 ${result} = Scan Message With Rspamc ${TESTDIR}/messages/from/from_dn_base64.eml - Check Rspamc ${result} ${SYMBOL}[Кириллица,user@example.org,user,example.org] + Check Rspamc ${result} ${SYMBOL}\[Кириллица,user@example.org,user,example.org] task:get_from('mime') - display name and comment ${result} = Scan Message With Rspamc ${TESTDIR}/messages/from/from_dn_comment.eml diff --git a/test/functional/cases/120_fuzzy/lib.robot b/test/functional/cases/120_fuzzy/lib.robot index 0f285e866..c7b3ce768 100644 --- a/test/functional/cases/120_fuzzy/lib.robot +++ b/test/functional/cases/120_fuzzy/lib.robot @@ -47,9 +47,10 @@ Fuzzy Fuzzy Test Run Keyword If ${RSPAMD_FUZZY_ADD_${message}} != 1 Fail "Fuzzy Add was not run" @{path_info} = Path Splitter ${message} @{fuzzy_files} = List Files In Directory @{pathinfo}[0] pattern=@{pathinfo}[1].fuzzy* absolute=1 - : FOR ${i} IN @{fuzzy_files} - \ ${result} = Scan Message With Rspamc ${i} - \ Check Rspamc ${result} ${FLAG1_SYMBOL} + FOR ${i} IN @{fuzzy_files} + ${result} = Scan Message With Rspamc ${i} + Check Rspamc ${result} ${FLAG1_SYMBOL} + END Fuzzy Miss Test [Arguments] ${message} @@ -59,10 +60,11 @@ Fuzzy Miss Test Fuzzy Overwrite Test [Arguments] ${message} ${flag_numbers} = Create List ${FLAG1_NUMBER} ${FLAG2_NUMBER} - : FOR ${i} IN @{flag_numbers} - \ ${result} = Run Rspamc -h ${LOCAL_ADDR}:${PORT_CONTROLLER} -w 10 - \ ... -f ${i} fuzzy_add ${message} - \ Check Rspamc ${result} + FOR ${i} IN @{flag_numbers} + ${result} = Run Rspamc -h ${LOCAL_ADDR}:${PORT_CONTROLLER} -w 10 + ... -f ${i} fuzzy_add ${message} + Check Rspamc ${result} + END Sync Fuzzy Storage ${result} = Scan Message With Rspamc ${message} Follow Rspamd Log @@ -129,24 +131,29 @@ Fuzzy Setup Encrypted Siphash Fuzzy Setup Encrypted siphash Fuzzy Multimessage Add Test - : FOR ${i} IN @{MESSAGES} - \ Fuzzy Add Test ${i} + FOR ${i} IN @{MESSAGES} + Fuzzy Add Test ${i} + END Fuzzy Multimessage Fuzzy Test - : FOR ${i} IN @{MESSAGES} - \ Fuzzy Fuzzy Test ${i} + FOR ${i} IN @{MESSAGES} + Fuzzy Fuzzy Test ${i} + END Fuzzy Multimessage Miss Test - : FOR ${i} IN @{RANDOM_MESSAGES} - \ Fuzzy Miss Test ${i} + FOR ${i} IN @{RANDOM_MESSAGES} + Fuzzy Miss Test ${i} + END Fuzzy Multimessage Delete Test - : FOR ${i} IN @{MESSAGES} - \ Fuzzy Delete Test ${i} + FOR ${i} IN @{MESSAGES} + Fuzzy Delete Test ${i} + END Fuzzy Multimessage Overwrite Test - : FOR ${i} IN @{MESSAGES} - \ Fuzzy Overwrite Test ${i} + FOR ${i} IN @{MESSAGES} + Fuzzy Overwrite Test ${i} + END Fuzzy Teardown Normal Teardown |