From 304747fad9924bf00dde8a43ad01b096daffdc59 Mon Sep 17 00:00:00 2001 From: Brennan Kinney <5098581+polarathene@users.noreply.github.com> Date: Thu, 5 Jan 2023 04:24:08 +1300 Subject: [PATCH] tests: Use `mail.example.test` as common container hostname (#2975) --- test/helper/setup.bash | 2 +- test/tests/serial/test_helper.bats | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helper/setup.bash b/test/helper/setup.bash index 061c07ac..522cfc84 100644 --- a/test/helper/setup.bash +++ b/test/helper/setup.bash @@ -110,7 +110,7 @@ function common_container_create() { run docker create \ --tty \ --name "${CONTAINER_NAME}" \ - --hostname "${TEST_FQDN:-mail.my-domain.com}" \ + --hostname "${TEST_FQDN:-mail.example.test}" \ --volume "${TEST_FILES_VOLUME}" \ --volume "${TEST_CONFIG_VOLUME}" \ --env ENABLE_AMAVIS=0 \ diff --git a/test/tests/serial/test_helper.bats b/test/tests/serial/test_helper.bats index 252f6102..9a9641d9 100644 --- a/test/tests/serial/test_helper.bats +++ b/test/tests/serial/test_helper.bats @@ -86,7 +86,7 @@ TEST_NAME_PREFIX='test helper functions:' # NOTE: Test requires external network access available @test "${TEST_NAME_PREFIX} wait_for_smtp_port_in_container returns immediately when port found" { local CONTAINER_NAME - CONTAINER_NAME=$(docker run --rm -d alpine sh -c "sleep 10") + CONTAINER_NAME=$(docker run --rm -d alpine sh -c "sleep 100") docker exec "${CONTAINER_NAME}" apk add netcat-openbsd docker exec "${CONTAINER_NAME}" nc -l 25 &