aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-10-17 16:45:51 +0100
committerGitHub <noreply@github.com>2016-10-17 16:45:51 +0100
commitf4acd9ba6f492526a2364c814c8a4704b7f8f8ce (patch)
tree8e9ce72cbfa41de2c8b56eeee9d33241ece1ef78 /test
parent5dabd901c9015b0efa6930aa13988ff47278ebcc (diff)
parentb4173ec5154ca05eebe9a5ff583dcedcba1f7e76 (diff)
downloadrspamd-f4acd9ba6f492526a2364c814c8a4704b7f8f8ce.tar.gz
rspamd-f4acd9ba6f492526a2364c814c8a4704b7f8f8ce.zip
Merge pull request #1044 from fatalbanana/ports
[Test] Wait for ports to be confirmed-free inbetween runs
Diffstat (limited to 'test')
-rw-r--r--test/functional/cases/100_general.robot2
-rw-r--r--test/functional/cases/101_lua.robot2
-rw-r--r--test/functional/cases/102_multimap.robot3
-rw-r--r--test/functional/cases/103_password.robot2
-rw-r--r--test/functional/cases/105_mimetypes.robot2
-rw-r--r--test/functional/cases/110_statistics/lib.robot5
-rw-r--r--test/functional/cases/110_statistics/sqlite-broken-stats-dir.robot2
-rw-r--r--test/functional/cases/115_dmarc.robot2
-rw-r--r--test/functional/cases/120_fuzzy/encrypted.robot2
-rw-r--r--test/functional/cases/120_fuzzy/fasthash-keyed.robot2
-rw-r--r--test/functional/cases/120_fuzzy/fasthash.robot2
-rw-r--r--test/functional/cases/120_fuzzy/general.robot2
-rw-r--r--test/functional/cases/120_fuzzy/lib.robot7
-rw-r--r--test/functional/cases/120_fuzzy/mumhash-keyed.robot2
-rw-r--r--test/functional/cases/120_fuzzy/mumhash.robot2
-rw-r--r--test/functional/cases/120_fuzzy/replication.robot9
-rw-r--r--test/functional/cases/120_fuzzy/siphash-keyed.robot2
-rw-r--r--test/functional/cases/120_fuzzy/siphash.robot2
-rw-r--r--test/functional/cases/120_fuzzy/xxhash-keyed.robot2
-rw-r--r--test/functional/cases/120_fuzzy/xxhash.robot2
-rw-r--r--test/functional/cases/121_json/100_preresult.robot2
-rw-r--r--test/functional/cases/121_json/101_simple.robot2
-rw-r--r--test/functional/cases/130_dkim.robot2
-rw-r--r--test/functional/cases/135_spamassassin.robot2
-rw-r--r--test/functional/cases/140_proxy.robot5
-rw-r--r--test/functional/lib/rspamd.py25
-rw-r--r--test/functional/lib/rspamd.robot14
-rw-r--r--test/functional/lib/vars.py8
28 files changed, 90 insertions, 26 deletions
diff --git a/test/functional/cases/100_general.robot b/test/functional/cases/100_general.robot
index 8876ef980..c07484ad2 100644
--- a/test/functional/cases/100_general.robot
+++ b/test/functional/cases/100_general.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Generic Setup
-Suite Teardown Generic Teardown
+Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
diff --git a/test/functional/cases/101_lua.robot b/test/functional/cases/101_lua.robot
index 27bb867f7..e7df19716 100644
--- a/test/functional/cases/101_lua.robot
+++ b/test/functional/cases/101_lua.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Test Teardown Generic Teardown
+Test Teardown Normal Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
diff --git a/test/functional/cases/102_multimap.robot b/test/functional/cases/102_multimap.robot
index 17ea2b741..f02320adf 100644
--- a/test/functional/cases/102_multimap.robot
+++ b/test/functional/cases/102_multimap.robot
@@ -246,5 +246,6 @@ Multimap Setup
Run Redis
Multimap Teardown
+ Normal Teardown
Shutdown Process With Children ${REDIS_PID}
- Generic Teardown
+ Wait For Port ${SOCK_STREAM} ${LOCAL_ADDR} ${REDIS_PORT}
diff --git a/test/functional/cases/103_password.robot b/test/functional/cases/103_password.robot
index 315f88b41..8068911f7 100644
--- a/test/functional/cases/103_password.robot
+++ b/test/functional/cases/103_password.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Test Teardown Generic Teardown
+Test Teardown Normal Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
diff --git a/test/functional/cases/105_mimetypes.robot b/test/functional/cases/105_mimetypes.robot
index 8e124e3f7..b47f64686 100644
--- a/test/functional/cases/105_mimetypes.robot
+++ b/test/functional/cases/105_mimetypes.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup MIMETypes Setup
-Suite Teardown Generic Teardown
+Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
diff --git a/test/functional/cases/110_statistics/lib.robot b/test/functional/cases/110_statistics/lib.robot
index 5f9e96038..98a9055fe 100644
--- a/test/functional/cases/110_statistics/lib.robot
+++ b/test/functional/cases/110_statistics/lib.robot
@@ -47,11 +47,12 @@ Redis Statistics Setup
Run Redis
Redis Statistics Teardown
- Generic Teardown
+ Normal Teardown
Shutdown Process With Children ${REDIS_PID}
+ Wait For Port ${SOCK_STREAM} ${LOCAL_ADDR} ${REDIS_PORT}
Statistics Setup
Generic Setup STATS_PATH_CACHE STATS_PATH_HAM STATS_PATH_SPAM
Statistics Teardown
- Generic Teardown
+ Normal Teardown
diff --git a/test/functional/cases/110_statistics/sqlite-broken-stats-dir.robot b/test/functional/cases/110_statistics/sqlite-broken-stats-dir.robot
index 57d75c294..b6caa4bd1 100644
--- a/test/functional/cases/110_statistics/sqlite-broken-stats-dir.robot
+++ b/test/functional/cases/110_statistics/sqlite-broken-stats-dir.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Generic Setup
-Suite Teardown Generic Teardown
+Suite Teardown Normal Teardown
Resource ${TESTDIR}/lib/rspamd.robot
Resource lib.robot
diff --git a/test/functional/cases/115_dmarc.robot b/test/functional/cases/115_dmarc.robot
index 0bf680ebb..a2a94c50c 100644
--- a/test/functional/cases/115_dmarc.robot
+++ b/test/functional/cases/115_dmarc.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup DMARC Setup
-Suite Teardown Generic Teardown
+Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
diff --git a/test/functional/cases/120_fuzzy/encrypted.robot b/test/functional/cases/120_fuzzy/encrypted.robot
index 21fd87908..8268b234b 100644
--- a/test/functional/cases/120_fuzzy/encrypted.robot
+++ b/test/functional/cases/120_fuzzy/encrypted.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Encrypted Siphash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/fasthash-keyed.robot b/test/functional/cases/120_fuzzy/fasthash-keyed.robot
index d135eaca0..8f949fceb 100644
--- a/test/functional/cases/120_fuzzy/fasthash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/fasthash-keyed.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Keyed Fasthash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/fasthash.robot b/test/functional/cases/120_fuzzy/fasthash.robot
index 75d596c73..cf0503622 100644
--- a/test/functional/cases/120_fuzzy/fasthash.robot
+++ b/test/functional/cases/120_fuzzy/fasthash.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Plain Fasthash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/general.robot b/test/functional/cases/120_fuzzy/general.robot
index 7d1b0171a..eb54f3733 100644
--- a/test/functional/cases/120_fuzzy/general.robot
+++ b/test/functional/cases/120_fuzzy/general.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Plain Siphash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/lib.robot b/test/functional/cases/120_fuzzy/lib.robot
index bde6e2dc5..79c19891b 100644
--- a/test/functional/cases/120_fuzzy/lib.robot
+++ b/test/functional/cases/120_fuzzy/lib.robot
@@ -143,3 +143,10 @@ Fuzzy Multimessage Delete Test
Fuzzy Multimessage Overwrite Test
: FOR ${i} IN @{MESSAGES}
\ Fuzzy Overwrite Test ${i}
+
+Fuzzy Teardown
+ ${port_normal} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_NORMAL}
+ ${port_fuzzy} = Create List ${SOCK_DGRAM} ${LOCAL_ADDR} ${PORT_FUZZY}
+ ${port_controller} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_CONTROLLER}
+ ${ports} = Create List ${port_normal} ${port_fuzzy} ${port_controller}
+ Generic Teardown @{ports}
diff --git a/test/functional/cases/120_fuzzy/mumhash-keyed.robot b/test/functional/cases/120_fuzzy/mumhash-keyed.robot
index cfef38e57..770da125a 100644
--- a/test/functional/cases/120_fuzzy/mumhash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/mumhash-keyed.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Keyed Mumhash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/mumhash.robot b/test/functional/cases/120_fuzzy/mumhash.robot
index 6e2714b64..5dd47aead 100644
--- a/test/functional/cases/120_fuzzy/mumhash.robot
+++ b/test/functional/cases/120_fuzzy/mumhash.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Plain Mumhash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/replication.robot b/test/functional/cases/120_fuzzy/replication.robot
index cb7d42533..8a3b875ed 100644
--- a/test/functional/cases/120_fuzzy/replication.robot
+++ b/test/functional/cases/120_fuzzy/replication.robot
@@ -82,3 +82,12 @@ Replication Teardown
Cleanup Temporary Directory ${SLAVE_TMPDIR}
Remove File ${TMP_INCLUDE1}
Remove File ${TMP_INCLUDE2}
+ ${port_normal} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_NORMAL}
+ ${port_fuzzy} = Create List ${SOCK_DGRAM} ${LOCAL_ADDR} ${PORT_FUZZY}
+ ${port_controller} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_CONTROLLER}
+ ${port_normal_slave} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_NORMAL_SLAVE}
+ ${port_fuzzy_slave} = Create List ${SOCK_DGRAM} ${LOCAL_ADDR} ${PORT_FUZZY_SLAVE}
+ ${port_controller_slave} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_CONTROLLER_SLAVE}
+ ${ports} = Create List ${port_normal} ${port_fuzzy} ${port_controller} ${port_normal_slave} ${port_fuzzy_slave} ${port_controller_slave}
+ : FOR ${i} IN @{ports}
+ \ Wait For Port @{i}[0] @{i}[1] @{i}[2]
diff --git a/test/functional/cases/120_fuzzy/siphash-keyed.robot b/test/functional/cases/120_fuzzy/siphash-keyed.robot
index 6ed321ca9..0acef322c 100644
--- a/test/functional/cases/120_fuzzy/siphash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/siphash-keyed.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Keyed Siphash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/siphash.robot b/test/functional/cases/120_fuzzy/siphash.robot
index 5ede462de..66d3d01d2 100644
--- a/test/functional/cases/120_fuzzy/siphash.robot
+++ b/test/functional/cases/120_fuzzy/siphash.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Plain Siphash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/xxhash-keyed.robot b/test/functional/cases/120_fuzzy/xxhash-keyed.robot
index b9840dc0d..a5d7f49a3 100644
--- a/test/functional/cases/120_fuzzy/xxhash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/xxhash-keyed.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Keyed Xxhash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/xxhash.robot b/test/functional/cases/120_fuzzy/xxhash.robot
index 4cb7fef75..e0fc346c8 100644
--- a/test/functional/cases/120_fuzzy/xxhash.robot
+++ b/test/functional/cases/120_fuzzy/xxhash.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Fuzzy Setup Plain Xxhash
-Suite Teardown Generic Teardown
+Suite Teardown Fuzzy Teardown
Resource lib.robot
*** Test Cases ***
diff --git a/test/functional/cases/121_json/100_preresult.robot b/test/functional/cases/121_json/100_preresult.robot
index 58682f6f5..aa25c0272 100644
--- a/test/functional/cases/121_json/100_preresult.robot
+++ b/test/functional/cases/121_json/100_preresult.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Generic Setup
-Suite Teardown Generic Teardown
+Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource lib.robot
Resource ${TESTDIR}/lib/rspamd.robot
diff --git a/test/functional/cases/121_json/101_simple.robot b/test/functional/cases/121_json/101_simple.robot
index 38b6ec11d..da5aa0f19 100644
--- a/test/functional/cases/121_json/101_simple.robot
+++ b/test/functional/cases/121_json/101_simple.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Generic Setup
-Suite Teardown Generic Teardown
+Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource lib.robot
Resource ${TESTDIR}/lib/rspamd.robot
diff --git a/test/functional/cases/130_dkim.robot b/test/functional/cases/130_dkim.robot
index 88ce5eb28..1bb08e639 100644
--- a/test/functional/cases/130_dkim.robot
+++ b/test/functional/cases/130_dkim.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Generic Setup
-Suite Teardown Generic Teardown
+Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
diff --git a/test/functional/cases/135_spamassassin.robot b/test/functional/cases/135_spamassassin.robot
index d1901068c..21793cc9d 100644
--- a/test/functional/cases/135_spamassassin.robot
+++ b/test/functional/cases/135_spamassassin.robot
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup SpamAssassin Setup
-Suite Teardown Generic Teardown
+Suite Teardown Simple Teardown
Library ${TESTDIR}/lib/rspamd.py
Resource ${TESTDIR}/lib/rspamd.robot
Variables ${TESTDIR}/lib/vars.py
diff --git a/test/functional/cases/140_proxy.robot b/test/functional/cases/140_proxy.robot
index 7b29f188a..42297ea62 100644
--- a/test/functional/cases/140_proxy.robot
+++ b/test/functional/cases/140_proxy.robot
@@ -47,3 +47,8 @@ Proxy Teardown
Shutdown Process With Children ${SLAVE_PID}
Cleanup Temporary Directory ${PROXY_TMPDIR}
Cleanup Temporary Directory ${SLAVE_TMPDIR}
+ ${port_normal} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_NORMAL}
+ ${port_proxy} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_PROXY}
+ ${ports} = Create List ${port_normal} ${port_proxy}
+ : FOR ${i} IN @{ports}
+ \ Wait For Port @{i}[0] @{i}[1] @{i}[2]
diff --git a/test/functional/lib/rspamd.py b/test/functional/lib/rspamd.py
index 89e79aec8..bfad7d61d 100644
--- a/test/functional/lib/rspamd.py
+++ b/test/functional/lib/rspamd.py
@@ -1,5 +1,6 @@
import demjson
import grp
+import ipaddress
import os
import os.path
import psutil
@@ -155,4 +156,26 @@ def shutdown_process_with_children(pid):
children = psutil.Process(pid=pid).children(recursive=False)
shutdown_process(pid)
for child in children:
- shutdown_process(child.pid)
+ try:
+ shutdown_process(child.pid)
+ except:
+ pass
+
+def wait_for_port(proto, addr, num):
+ i = ipaddress.ip_address(addr)
+ if (i.version == 6):
+ af = socket.AF_INET6
+ else:
+ af = socket.AF_INET
+ while True:
+ try:
+ s = socket.socket(af, proto)
+ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+ s.bind((addr, num))
+ if (proto == socket.SOCK_STREAM):
+ s.listen(0)
+ break
+ except:
+ pass
+ time.sleep(0.1)
+ s.close()
diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index 19359a038..84639c3e7 100644
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -62,8 +62,11 @@ Generic Setup
\ ... ELSE Fail 'RSPAMD_SCOPE must be Test or Suite'
Generic Teardown
+ [Arguments] @{ports}
Shutdown Process With Children ${RSPAMD_PID}
Cleanup Temporary Directory ${TMPDIR}
+ : FOR ${i} IN @{ports}
+ \ Wait For Port @{i}[0] @{i}[1] @{i}[2]
Log Logs
[Arguments] ${logfile} ${position}
@@ -71,6 +74,12 @@ Log Logs
Log ${the_log}
[Return] ${position}
+Normal Teardown
+ ${port_normal} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_NORMAL}
+ ${port_controller} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_CONTROLLER}
+ ${ports} = Create List ${port_normal} ${port_controller}
+ Generic Teardown @{ports}
+
Redis HSET
[Arguments] ${hash} ${key} ${value}
${result} = Run Process redis-cli -h ${REDIS_ADDR} -p ${REDIS_PORT}
@@ -129,6 +138,11 @@ Scan Message With Rspamc
${result} = Run Rspamc -p -h ${LOCAL_ADDR}:${PORT_NORMAL} @{vargs} ${msg_file}
[Return] ${result}
+Simple Teardown
+ ${port_normal} = Create List ${SOCK_STREAM} ${LOCAL_ADDR} ${PORT_NORMAL}
+ ${ports} = Create List ${port_normal}
+ Generic Teardown @{ports}
+
Sync Fuzzy Storage
[Arguments] @{vargs}
${len} = Get Length ${vargs}
diff --git a/test/functional/lib/vars.py b/test/functional/lib/vars.py
index 917bde842..3ba68fea3 100644
--- a/test/functional/lib/vars.py
+++ b/test/functional/lib/vars.py
@@ -1,6 +1,8 @@
+import socket
+
KEY_PVT1 = 'ekd3x36tfa5gd76t6pa8hqif3ott7n1siuux68exbkk7ukscte9y'
KEY_PUB1 = 'm8kneubpcjsb8sbsoj7jy7azj9fdd3xmj63txni86a8ye9ncomny'
-LOCAL_ADDR = '127.0.0.1'
+LOCAL_ADDR = u'127.0.0.1'
PORT_CONTROLLER = 56790
PORT_CONTROLLER_SLAVE = 56793
PORT_FUZZY = 56791
@@ -8,7 +10,9 @@ PORT_FUZZY_SLAVE = 56792
PORT_NORMAL = 56789
PORT_NORMAL_SLAVE = 56794
PORT_PROXY = 56795
-REDIS_ADDR = '127.0.0.1'
+REDIS_ADDR = u'127.0.0.1'
REDIS_PORT = 56379
RSPAMD_GROUP = 'nogroup'
RSPAMD_USER = 'nobody'
+SOCK_DGRAM = socket.SOCK_DGRAM
+SOCK_STREAM = socket.SOCK_STREAM
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 11:01:25 +0000