Extract default relay host test

centralize common test variables and functions
This commit is contained in:
Martin Schulze 2019-08-08 21:33:55 +02:00
parent 6a7608fe7b
commit db160bd977
5 changed files with 65 additions and 38 deletions

View file

@ -1,8 +1,6 @@
load 'test_helper/bats-support/load'
load 'test_helper/bats-assert/load'
load 'test_helper/common'
NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME=non-default-docker-mail-network
NAME=tvial/docker-mailserver:testing
setup() {
docker network create --driver bridge ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME}
docker network create --driver bridge ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME}2
@ -31,7 +29,7 @@ setup() {
-t ${NAME}
# wait until postfix is up
repeat_until_success_or_timeout 60 docker exec mail_smtponly_second_network /bin/sh -c "nc -z 0.0.0.0 25"
wait_for_smtp_port_in_container mail_smtponly_second_network
}
teardown() {
@ -41,20 +39,6 @@ teardown() {
docker network rm ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME} ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME}2
}
function repeat_until_success_or_timeout {
TIMEOUT=$1
STARTTIME=$SECONDS
shift 1
until "$@"
do
sleep 5
if [[ $(($SECONDS - $STARTTIME )) -gt $TIMEOUT ]]; then
echo "Timed out on command: $@"
exit 1
fi
done
}
@test "checking PERMIT_DOCKER: connected-networks" {
ipnet1=$(docker network inspect --format '{{(index .IPAM.Config 0).Subnet}}' non-default-docker-mail-network)
ipnet2=$(docker network inspect --format '{{(index .IPAM.Config 0).Subnet}}' non-default-docker-mail-network2)