correct remaining tests

This commit is contained in:
georglauterbach 2024-01-25 18:54:18 +01:00
parent 94d8f0fdb4
commit fc26674d65
No known key found for this signature in database
GPG Key ID: F367F7C43C118578
2 changed files with 3 additions and 3 deletions

View File

@ -14,6 +14,7 @@ function setup_file() {
--env ENABLE_AMAVIS=1 --env ENABLE_AMAVIS=1
--env AMAVIS_LOGLEVEL=2 --env AMAVIS_LOGLEVEL=2
--env ENABLE_SPAMASSASSIN=1 --env ENABLE_SPAMASSASSIN=1
--env SPAM_SUBJECT='***SPAM*** '
) )
_common_container_setup 'CUSTOM_SETUP_ARGUMENTS' _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'

View File

@ -9,12 +9,11 @@ CONTAINER_NAME=${CONTAINER2_NAME}
function teardown() { _default_teardown ; } function teardown() { _default_teardown ; }
@test "'SPAM_SUBJECT=undef' should update Amavis config" { @test "Empty 'SPAM_SUBJECT' should set correct value in Amavis config" {
export CONTAINER_NAME=${CONTAINER1_NAME} export CONTAINER_NAME=${CONTAINER1_NAME}
local CUSTOM_SETUP_ARGUMENTS=( local CUSTOM_SETUP_ARGUMENTS=(
--env ENABLE_AMAVIS=1 --env ENABLE_AMAVIS=1
--env ENABLE_SPAMASSASSIN=1 --env ENABLE_SPAMASSASSIN=1
--env SPAM_SUBJECT='undef'
) )
_init_with_defaults _init_with_defaults
_common_container_setup 'CUSTOM_SETUP_ARGUMENTS' _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'
@ -36,7 +35,7 @@ function teardown() { _default_teardown ; }
--env SA_TAG=-5.0 --env SA_TAG=-5.0
--env SA_TAG2=2.0 --env SA_TAG2=2.0
--env SA_KILL=3.0 --env SA_KILL=3.0
--env SPAM_SUBJECT="SPAM: " --env SPAM_SUBJECT='SPAM: '
--env VIRUSMAILS_DELETE_DELAY=7 --env VIRUSMAILS_DELETE_DELAY=7
--env ENABLE_SRS=1 --env ENABLE_SRS=1
--env ENABLE_MANAGESIEVE=1 --env ENABLE_MANAGESIEVE=1