Bläddra i källkod

Merge pull request #4709 from fatalbanana/demiltertest

[Test] Skip miltertest tests if it is not installed
tags/3.8.0
Vsevolod Stakhov 6 månader sedan
förälder
incheckning
32ae936398
Inget konto är kopplat till bidragsgivarens mejladress

+ 2
- 0
test/functional/cases/131_dkim_signing/006_milter.robot Visa fil

*** Settings *** *** Settings ***
Suite Setup Rspamd Setup Suite Setup Rspamd Setup
Suite Teardown Rspamd Teardown Suite Teardown Rspamd Teardown
Test Tags miltertest
Library Process Library Process
Library ${RSPAMD_TESTDIR}/lib/rspamd.py Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
*** Keywords *** *** Keywords ***
Milter Test Milter Test
[Arguments] ${mtlua} [Arguments] ${mtlua}
Skip If not ${HAVE_MILTERTEST} msg=miltertest not installed
${result} = Run Process miltertest -Dport\=${RSPAMD_PORT_PROXY} -Dhost\=${RSPAMD_LOCAL_ADDR} -s ${RSPAMD_TESTDIR}/lua/miltertest/${mtlua} ${result} = Run Process miltertest -Dport\=${RSPAMD_PORT_PROXY} -Dhost\=${RSPAMD_LOCAL_ADDR} -s ${RSPAMD_TESTDIR}/lua/miltertest/${mtlua}
... cwd=${RSPAMD_TESTDIR}/lua/miltertest ... cwd=${RSPAMD_TESTDIR}/lua/miltertest
Should Match Regexp ${result.stderr} ^$ Should Match Regexp ${result.stderr} ^$

+ 2
- 0
test/functional/cases/180_milter.robot Visa fil

*** Settings *** *** Settings ***
Suite Setup Rspamd Setup Suite Setup Rspamd Setup
Suite Teardown Rspamd Teardown Suite Teardown Rspamd Teardown
Test Tags miltertest
Library Process Library Process
Library ${RSPAMD_TESTDIR}/lib/rspamd.py Library ${RSPAMD_TESTDIR}/lib/rspamd.py
Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot
*** Keywords *** *** Keywords ***
Milter Test Milter Test
[Arguments] ${mtlua} [Arguments] ${mtlua}
Skip If not ${HAVE_MILTERTEST} msg=miltertest not installed
${result} = Run Process miltertest -Dport\=${RSPAMD_PORT_PROXY} -Dhost\=${RSPAMD_LOCAL_ADDR} -s ${RSPAMD_TESTDIR}/lua/miltertest/${mtlua} ${result} = Run Process miltertest -Dport\=${RSPAMD_PORT_PROXY} -Dhost\=${RSPAMD_LOCAL_ADDR} -s ${RSPAMD_TESTDIR}/lua/miltertest/${mtlua}
... cwd=${RSPAMD_TESTDIR}/lua/miltertest ... cwd=${RSPAMD_TESTDIR}/lua/miltertest
Should Match Regexp ${result.stderr} ^$ Should Match Regexp ${result.stderr} ^$

+ 2
- 0
test/functional/lib/vars.py Visa fil

import shutil
import socket import socket


CONTROLLER_ERRORS = True CONTROLLER_ERRORS = True
HAVE_MILTERTEST = shutil.which('miltertest') and True or False
RSPAMD_EXTERNAL_RELAY_ENABLED = False RSPAMD_EXTERNAL_RELAY_ENABLED = False
RSPAMD_KEY_PVT1 = 'ekd3x36tfa5gd76t6pa8hqif3ott7n1siuux68exbkk7ukscte9y' RSPAMD_KEY_PVT1 = 'ekd3x36tfa5gd76t6pa8hqif3ott7n1siuux68exbkk7ukscte9y'
RSPAMD_KEY_PUB1 = 'm8kneubpcjsb8sbsoj7jy7azj9fdd3xmj63txni86a8ye9ncomny' RSPAMD_KEY_PUB1 = 'm8kneubpcjsb8sbsoj7jy7azj9fdd3xmj63txni86a8ye9ncomny'

Laddar…
Avbryt
Spara