diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-21 12:34:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 12:34:54 +0100 |
| commit | 4152bff2f4b8ca5fe9a8e5a2edcaa84d120e7843 (patch) | |
| tree | 80620e795efb275b92fe7ecddc3e604e5e122656 /test | |
| parent | 7f61d936e15ac3de067ba2475981c99f31227733 (diff) | |
| parent | f1c65cead4fe3996bee66bb6966eb4bd9d2ecd05 (diff) | |
| download | rspamd-4152bff2f4b8ca5fe9a8e5a2edcaa84d120e7843.tar.gz rspamd-4152bff2f4b8ca5fe9a8e5a2edcaa84d120e7843.zip | |
Merge pull request #734 from fatalbanana/tests
Fix some race conditions in functional tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/lib/rspamd.robot | 2 |
1 files changed, 2 insertions, 0 deletions
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} |