From b3d0df4a7057ae0cba32986d2f029599eed63f38 Mon Sep 17 00:00:00 2001 From: "Thomas A. Kilian" Date: Wed, 12 Apr 2017 16:23:18 +0200 Subject: [PATCH] adapted test cases modified: target/start-mailserver.sh modified: test/tests.bats --- target/start-mailserver.sh | 2 +- test/tests.bats | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index d4b4f543..b86a7464 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -534,7 +534,7 @@ function _setup_ldap() { function _setup_postgrey() { notify 'inf' "Configuring postgrey" sed -i -e 's/bl.spamcop.net$/bl.spamcop.net, check_policy_service inet:127.0.0.1:10023/' /etc/postfix/main.cf - sed -i -e "s/\"--inet=10023\"/\"--inet=10023 --delay=$POSTGREY_DELAY --max-age=$POSTGREY_MAX_AGE\"/" /etc/default/postgrey + sed -i -e "s/\"--inet=127.0.0.1:10023\"/\"--inet=127.0.0.1:10023 --delay=$POSTGREY_DELAY --max-age=$POSTGREY_MAX_AGE\"/" /etc/default/postgrey TEXT_FOUND=`grep -i "POSTGREY_TEXT" /etc/default/postgrey | wc -l` if [ $TEXT_FOUND -eq 0 ]; then diff --git a/test/tests.bats b/test/tests.bats index df632df8..57b73ef8 100644 --- a/test/tests.bats +++ b/test/tests.bats @@ -132,7 +132,7 @@ load 'test_helper/bats-assert/load' } @test "checking postgrey: /etc/default/postgrey correctly edited and has the default values" { - run docker exec mail_with_postgrey /bin/bash -c "grep '^POSTGREY_OPTS=\"--inet=10023 --delay=15 --max-age=35\"$' /etc/default/postgrey | wc -l" + run docker exec mail_with_postgrey /bin/bash -c "grep '^POSTGREY_OPTS=\"--inet=127.0.0.1:10023 --delay=15 --max-age=35\"$' /etc/default/postgrey | wc -l" assert_success assert_output 1 run docker exec mail_with_postgrey /bin/bash -c "grep '^POSTGREY_TEXT=\"Delayed by postgrey\"$' /etc/default/postgrey | wc -l"