diff options
| -rw-r--r-- | circle.yml | 4 | ||||
| -rw-r--r-- | test/functional/lib/rspamd.robot | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/circle.yml b/circle.yml index accb1a0a9..1c0ce6745 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,3 @@ -machine: - services: - - redis - dependencies: pre: - sudo apt-get update -qq diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot index 7bba2706c..35cf66648 100644 --- a/test/functional/lib/rspamd.robot +++ b/test/functional/lib/rspamd.robot @@ -79,6 +79,7 @@ Run Redis ${result} = Run Process redis-server ${TMPDIR}/redis-server.conf Run Keyword If ${result.rc} != 0 Log ${result.stderr} Should Be Equal As Integers ${result.rc} 0 + Wait Until Created ${TMPDIR}/redis.pid ${REDIS_PID} = Get File ${TMPDIR}/redis.pid Run Keyword If '${REDIS_SCOPE}' == 'Test' Set Test Variable ${REDIS_PID} ... ELSE IF '${REDIS_SCOPE}' == 'Suite' Set Suite Variable ${REDIS_PID} @@ -109,6 +110,7 @@ Run Rspamd Run Keyword If ${result.rc} != 0 Log ${result.stderr} ${rspamd_logpos} = Log Logs ${TMPDIR}/rspamd.log 0 Should Be Equal As Integers ${result.rc} 0 + Wait Until Created ${TMPDIR}/rspamd.pid ${rspamd_pid} = Get File ${TMPDIR}/rspamd.pid [Return] ${TMPDIR} ${rspamd_pid} ${rspamd_logpos} |