adjust tests to use new functions

test/tests/parallel/set1/dovecot/dovecot_quotas.bats

@@ -225,9 +225,12 @@ function teardown_file() { _default_teardown ; }
   sleep 10
 
   # send some big emails
-  _send_email 'email-templates/quota-exceeded' '0.0.0.0 25'
+  _send_email --to 'quotauser@otherdomain.tld' 'quota-exceeded'
-  _send_email 'email-templates/quota-exceeded' '0.0.0.0 25'
+  assert_success
-  _send_email 'email-templates/quota-exceeded' '0.0.0.0 25'
+  _send_email --to 'quotauser@otherdomain.tld' 'quota-exceeded'
+  assert_success
+  _send_email --to 'quotauser@otherdomain.tld' 'quota-exceeded'
+  assert_success
   # check for quota warn message existence
   run _repeat_until_success_or_timeout 20 _exec_in_container grep -R 'Subject: quota warning' /var/mail/otherdomain.tld/quotauser/new/
   assert_success

test/tests/parallel/set1/dovecot/dovecot_sieve.bats

@@ -26,9 +26,11 @@ function setup_file() {
   _wait_for_smtp_port_in_container
 
   # Single mail sent from 'spam@spam.com' that is handled by User (relocate) and Global (copy) sieves for user1:
-  _send_email 'email-templates/sieve-spam-folder'
+  _send_email 'sieve/spam-folder'
+  assert_success
   # Mail for user2 triggers the sieve-pipe:
-  _send_email 'email-templates/sieve-pipe'
+  _send_email --to 'user2@otherdomain.tld' 'sieve/pipe'
+  assert_success
 
   _wait_for_empty_mail_queue_in_container
 }

test/tests/parallel/set1/dovecot/mailbox_format_dbox.bats

@@ -26,7 +26,8 @@ function teardown() { _default_teardown ; }
   _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'
   _wait_for_smtp_port_in_container
 
-  _send_email 'email-templates/existing-user1'
+  _send_email 'existing/user1'
+  assert_success
   _wait_for_empty_mail_queue_in_container
 
   # Mail received should be stored as `u.1` (one file per message)
@@ -47,7 +48,8 @@ function teardown() { _default_teardown ; }
   _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'
   _wait_for_smtp_port_in_container
 
-  _send_email 'email-templates/existing-user1'
+  _send_email 'existing/user1'
+  assert_success
   _wait_for_empty_mail_queue_in_container
 
   # Mail received should be stored in `m.1` (1 or more messages)

test/tests/parallel/set1/dovecot/special_use_folders.bats

@@ -14,7 +14,8 @@ function setup_file() {
 function teardown_file() { _default_teardown ; }
 
 @test 'normal delivery works' {
-  _send_email 'email-templates/existing-user1'
+  _send_email 'existing/user1'
+  assert_success
   _count_files_in_directory_in_container /var/mail/localhost.localdomain/user1/new 1
 }
 
@@ -26,7 +27,7 @@ function teardown_file() { _default_teardown ; }
 }
 
 @test "(IMAP) special-use folders should be created when necessary" {
-  _send_email 'nc_templates/imap_special_use_folders' '-w 8 0.0.0.0 143'
+  _nc_wrapper '/tmp/docker-mailserver-test/nc/imap_special_use_folders.txt' '-w 8 0.0.0.0 143'
   assert_output --partial 'Drafts'
   assert_output --partial 'Junk'
   assert_output --partial 'Trash'

test/tests/parallel/set1/spam_virus/clamav.bats

@@ -25,34 +25,35 @@ function setup_file() {
 
   _wait_for_service postfix
   _wait_for_smtp_port_in_container
-  _send_email 'email-templates/amavis-virus'
+  _send_email 'amavis/virus'
+  assert_success
   _wait_for_empty_mail_queue_in_container
 }
 
 function teardown_file() { _default_teardown ; }
 
-@test "log files exist at /var/log/mail directory" {
+@test 'log files exist at /var/log/mail directory' {
   _run_in_container_bash "ls -1 /var/log/mail/ | grep -E 'clamav|freshclam|mail.log' | wc -l"
   assert_success
   assert_output 3
 }
 
-@test "should be identified by Amavis" {
+@test 'should be identified by Amavis' {
   _run_in_container grep -i 'Found secondary av scanner ClamAV-clamscan' /var/log/mail/mail.log
   assert_success
 }
 
-@test "freshclam cron is enabled" {
+@test 'freshclam cron is enabled' {
   _run_in_container_bash "grep '/usr/bin/freshclam' -r /etc/cron.d"
   assert_success
 }
 
-@test "env CLAMAV_MESSAGE_SIZE_LIMIT is set correctly" {
+@test 'env CLAMAV_MESSAGE_SIZE_LIMIT is set correctly' {
   _run_in_container grep -q '^MaxFileSize 30M$' /etc/clamav/clamd.conf
   assert_success
 }
 
-@test "rejects virus" {
+@test 'rejects virus' {
-  _run_in_container_bash "grep 'Blocked INFECTED' /var/log/mail/mail.log | grep '<virus@external.tld> -> <user1@localhost.localdomain>'"
+  _run_in_container_bash "grep 'Blocked INFECTED' /var/log/mail/mail.log | grep '<example-user@example.test> -> <user1@localhost.localdomain>'"
   assert_success
 }

test/tests/parallel/set1/spam_virus/disabled_clamav_spamassassin.bats

@@ -12,12 +12,14 @@ function setup_file() {
     --env ENABLE_CLAMAV=0
     --env ENABLE_SPAMASSASSIN=0
     --env AMAVIS_LOGLEVEL=2
+    --env PERMIT_DOCKER=container
   )
 
   _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'
   _wait_for_smtp_port_in_container
 
-  _send_email 'email-templates/existing-user1'
+  _send_email 'existing/user1'
+  assert_success
   _wait_for_empty_mail_queue_in_container
 }
 

test/tests/parallel/set1/spam_virus/fail2ban.bats

@@ -73,8 +73,8 @@ function teardown_file() {
 @test "ban ip on multiple failed login" {
   CONTAINER1_IP=$(_get_container_ip "${CONTAINER1_NAME}")
   # Trigger a ban by failing to login twice:
-  CONTAINER_NAME=${CONTAINER2_NAME} _send_email 'auth/smtp-auth-login-wrong' "${CONTAINER1_IP} 465"
+  CONTAINER_NAME=${CONTAINER2_NAME} _nc_wrapper '/tmp/docker-mailserver-test/auth/smtp-auth-login-wrong.txt' "${CONTAINER1_IP} 465"
-  CONTAINER_NAME=${CONTAINER2_NAME} _send_email 'auth/smtp-auth-login-wrong' "${CONTAINER1_IP} 465"
+  CONTAINER_NAME=${CONTAINER2_NAME} _nc_wrapper '/tmp/docker-mailserver-test/auth/smtp-auth-login-wrong.txt' "${CONTAINER1_IP} 465"
 
   # Checking that CONTAINER2_IP is banned in "${CONTAINER1_NAME}"
   CONTAINER2_IP=$(_get_container_ip "${CONTAINER2_NAME}")

test/tests/parallel/set1/spam_virus/postgrey_enabled.bats

@@ -51,17 +51,15 @@ function teardown_file() { _default_teardown ; }
   _reload_postfix
 
   # Send test mail (it should fail to deliver):
-  _send_test_mail '/tmp/docker-mailserver-test/email-templates/postgrey.txt' '25'
+  _send_email --from 'user@external.tld' 'postgrey'
+  assert_failure
+  assert_output --partial 'Recipient address rejected: Delayed by Postgrey'
 
   # Confirm mail was greylisted:
   _should_have_log_entry \
     'action=greylist' \
     'reason=new' \
     'client_address=127.0.0.1/32, sender=user@external.tld, recipient=user1@localhost.localdomain'
-
-  _repeat_until_success_or_timeout 10 _run_in_container grep \
-    'Recipient address rejected: Delayed by Postgrey' \
-    /var/log/mail/mail.log
 }
 
 # NOTE: This test case depends on the previous one
@@ -69,7 +67,8 @@ function teardown_file() { _default_teardown ; }
   # Wait until `$POSTGREY_DELAY` seconds pass before trying again:
   sleep 3
   # Retry delivering test mail (it should be trusted this time):
-  _send_test_mail '/tmp/docker-mailserver-test/email-templates/postgrey.txt' '25'
+  _send_email --from 'user@external.tld' 'postgrey'
+  assert_success
 
   # Confirm postgrey permitted delivery (triplet is now trusted):
   _should_have_log_entry \
@@ -78,8 +77,7 @@ function teardown_file() { _default_teardown ; }
     'client_address=127.0.0.1/32, sender=user@external.tld, recipient=user1@localhost.localdomain'
 }
 
-
+# NOTE: These two whitelist tests use `files/nc/` instead of `files/emails`.
-# NOTE: These two whitelist tests use `test-files/nc_templates/` instead of `test-files/email-templates`.
 # - This allows to bypass the SMTP protocol on port 25, and send data directly to Postgrey instead.
 # - Appears to be a workaround due to `client_name=localhost` when sent from Postfix.
 # - Could send over port 25 if whitelisting `localhost`,
@@ -87,7 +85,7 @@ function teardown_file() { _default_teardown ; }
 #   - It'd also cause the earlier greylist test to fail.
 # - TODO: Actually confirm whitelist feature works correctly as these test cases are using a workaround:
 @test "should whitelist sender 'user@whitelist.tld'" {
-  _send_test_mail '/tmp/docker-mailserver-test/nc_templates/postgrey_whitelist.txt' '10023'
+  _nc_wrapper '/tmp/docker-mailserver-test/nc/postgrey_whitelist.txt' '-w 0 0.0.0.0 10023'
 
   _should_have_log_entry \
     'action=pass' \
@@ -96,7 +94,7 @@ function teardown_file() { _default_teardown ; }
 }
 
 @test "should whitelist recipient 'user2@otherdomain.tld'" {
-  _send_test_mail '/tmp/docker-mailserver-test/nc_templates/postgrey_whitelist_recipients.txt' '10023'
+  _nc_wrapper '/tmp/docker-mailserver-test/nc/postgrey_whitelist_recipients.txt' '-w 0 0.0.0.0 10023'
 
   _should_have_log_entry \
     'action=pass' \
@@ -104,21 +102,10 @@ function teardown_file() { _default_teardown ; }
     'client_address=127.0.0.1/32, sender=test@nonwhitelist.tld, recipient=user2@otherdomain.tld'
 }
 
-function _send_test_mail() {
-  local MAIL_TEMPLATE=$1
-  local PORT=${2:-25}
-
-  # `-w 0` terminates the connection after sending the template, it does not wait for a response.
-  # This is required for port 10023, otherwise the connection never drops.
-  # It could increase the number of seconds to wait for port 25 to allow for asserting a response,
-  # but that would enforce the delay in tests for port 10023.
-  _run_in_container_bash "nc -w 0 0.0.0.0 ${PORT} < ${MAIL_TEMPLATE}"
-}
-
 function _should_have_log_entry() {
-  local ACTION=$1
+  local ACTION=${1}
-  local REASON=$2
+  local REASON=${2}
-  local TRIPLET=$3
+  local TRIPLET=${3}
 
   # Allow some extra time for logs to update to avoids a false-positive failure:
   _run_until_success_or_timeout 10 _exec_in_container grep \

test/tests/parallel/set1/spam_virus/postscreen.bats

@@ -13,70 +13,37 @@ function setup_file() {
   export CONTAINER_NAME
 
   CONTAINER_NAME=${CONTAINER1_NAME}
-  local CUSTOM_SETUP_ARGUMENTS=(
+  local CUSTOM_SETUP_ARGUMENTS=(--env POSTSCREEN_ACTION=enforce)
-    --env POSTSCREEN_ACTION=enforce
-  )
   _init_with_defaults
   _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'
   _wait_for_smtp_port_in_container
 
-  # A standard DMS instance to send mail from:
-  # NOTE: None of DMS is actually used for this (just bash + nc).
   CONTAINER_NAME=${CONTAINER2_NAME}
   _init_with_defaults
-  # No need to wait for DMS to be ready for this container:
+  local CUSTOM_SETUP_ARGUMENTS=(--env PERMIT_DOCKER=host)
-  _common_container_create
+  _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'
-  run docker start "${CONTAINER_NAME}"
+  _wait_for_smtp_port_in_container
-  assert_success
-
-  # Set default implicit container fallback for helpers:
-  CONTAINER_NAME=${CONTAINER1_NAME}
 }
 
 function teardown_file() {
   docker rm -f "${CONTAINER1_NAME}" "${CONTAINER2_NAME}"
 }
 
+# Sending mail here is done in a dirty way intentionally.
 @test 'should fail send when talking out of turn' {
-  CONTAINER_NAME=${CONTAINER2_NAME} _send_email 'email-templates/postscreen' "${CONTAINER1_IP} 25"
+  CONTAINER_NAME=${CONTAINER1_NAME}
+  _run_in_container_bash "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/emails/nc_raw/postscreen.txt"
   assert_output --partial 'Protocol error'
 
-  # Expected postscreen log entry:
   _run_in_container cat /var/log/mail/mail.log
   assert_output --partial 'COMMAND PIPELINING'
+  assert_output --partial 'DATA without valid RCPT'
 }
 
 @test "should successfully pass postscreen and get postfix greeting message (respecting postscreen_greet_wait time)" {
-  # NOTE: Sometimes fails on first attempt (trying too soon?),
+  CONTAINER_NAME=${CONTAINER2_NAME}
-  # Instead of a `run` + asserting partial, Using repeat + internal grep match:
+  local MAIL_ID=$(_send_email_and_get_id 'postscreen')
-  _repeat_until_success_or_timeout 10 _should_wait_turn_speaking_smtp \
-    "${CONTAINER2_NAME}" \
-    "${CONTAINER1_IP}" \
-    '/tmp/docker-mailserver-test/email-templates/postscreen.txt' \
-    '220 mail.example.test ESMTP'
 
-  # Expected postscreen log entry:
+  _print_mail_log_for_id "${MAIL_ID}"
-  _run_in_container cat /var/log/mail/mail.log
+  assert_output --partial "stored mail into mailbox 'INBOX'"
-  assert_output --partial 'PASS NEW'
-}
-
-# When postscreen is active, it prevents the usual method of piping a file through nc:
-# (Won't work: CONTAINER_NAME=${CLIENT_CONTAINER_NAME} _send_email "${SMTP_TEMPLATE}" "${TARGET_CONTAINER_IP} 25")
-# The below workaround respects `postscreen_greet_wait` time (default 6 sec), talking to the mail-server in turn:
-# https://www.postfix.org/postconf.5.html#postscreen_greet_wait
-function _should_wait_turn_speaking_smtp() {
-  local CLIENT_CONTAINER_NAME=$1
-  local TARGET_CONTAINER_IP=$2
-  local SMTP_TEMPLATE=$3
-  local EXPECTED=$4
-
-  # shellcheck disable=SC2016
-  local UGLY_WORKAROUND='exec 3<>/dev/tcp/'"${TARGET_CONTAINER_IP}"'/25 && \
-    while IFS= read -r cmd; do \
-      head -1 <&3; \
-      [[ ${cmd} == "EHLO"* ]] && sleep 6; \
-      echo ${cmd} >&3; \
-    done < '"${SMTP_TEMPLATE}"
-
-  docker exec "${CLIENT_CONTAINER_NAME}" bash -c "${UGLY_WORKAROUND}" | grep "${EXPECTED}"
 }

test/tests/parallel/set1/spam_virus/rspamd_full.bats

@@ -45,10 +45,10 @@ function setup_file() {
 
   # We will send 3 emails: the first one should pass just fine; the second one should
   # be rejected due to spam; the third one should be rejected due to a virus.
-  export MAIL_ID1=$(_send_email_and_get_id 'email-templates/rspamd-pass')
+  export MAIL_ID1=$(_send_email_and_get_id --from 'rspamd-pass@example.test' 'rspamd/pass')
-  export MAIL_ID2=$(_send_email_and_get_id 'email-templates/rspamd-spam')
+  export MAIL_ID2=$(_send_email_and_get_id --from 'rspamd-spam@example.test' 'rspamd/spam')
-  export MAIL_ID3=$(_send_email_and_get_id 'email-templates/rspamd-virus')
+  export MAIL_ID3=$(_send_email_and_get_id --from 'rspamd-virus@example.test' 'rspamd/virus')
-  export MAIL_ID4=$(_send_email_and_get_id 'email-templates/rspamd-spam-header')
+  export MAIL_ID4=$(_send_email_and_get_id --from 'rspamd-spam-header@example.test' 'rspamd/spam-header')
 
   for ID in MAIL_ID{1,2,3,4}; do
     [[ -n ${!ID} ]] || { echo "${ID} is empty - aborting!" ; return 1 ; }
@@ -256,7 +256,7 @@ function teardown_file() { _default_teardown ; }
 
   # Move an email to the "Junk" folder from "INBOX"; the first email we
   # sent should pass fine, hence we can now move it.
-  _send_email 'nc_templates/rspamd_imap_move_to_junk' '0.0.0.0 143'
+  _nc_wrapper '/tmp/docker-mailserver-test/nc/rspamd_imap_move_to_junk.txt' '0.0.0.0 143'
   sleep 1 # wait for the transaction to finish
 
   _run_in_container cat /var/log/mail/mail.log
@@ -270,7 +270,7 @@ function teardown_file() { _default_teardown ; }
   # Move an email to the "INBOX" folder from "Junk"; there should be two mails
   # in the "Junk" folder, since the second email we sent during setup should
   # have landed in the Junk folder already.
-  _send_email 'nc_templates/rspamd_imap_move_to_inbox' '0.0.0.0 143'
+  _nc_wrapper '/tmp/docker-mailserver-test/nc/rspamd_imap_move_to_inbox.txt' '0.0.0.0 143'
   sleep 1 # wait for the transaction to finish
 
   _run_in_container cat /var/log/mail/mail.log

test/tests/parallel/set1/spam_virus/spam_junk_folder.bats

@@ -95,7 +95,7 @@ function teardown() { _default_teardown ; }
 function _should_send_spam_message() {
   _wait_for_smtp_port_in_container
   _wait_for_tcp_port_in_container 10024 # port 10024 is for Amavis
-  _send_email 'email-templates/amavis-spam'
+  _send_email 'amavis/spam'
 }
 
 function _should_be_received_by_amavis() {

test/tests/parallel/set1/tls/dhparams.bats

@@ -38,7 +38,7 @@ function teardown() { _default_teardown ; }
 # - A warning is raised about usage of potentially insecure parameters.
 @test "Custom" {
   export CONTAINER_NAME=${CONTAINER2_NAME}
-  local DH_PARAMS_CUSTOM='test/test-files/ssl/custom-dhe-params.pem'
+  local DH_PARAMS_CUSTOM='test/files/ssl/custom-dhe-params.pem'
   local DH_CHECKSUM_CUSTOM=$(sha512sum "${DH_PARAMS_CUSTOM}" | awk '{print $1}')
 
   _init_with_defaults

test/tests/parallel/set1/tls/letsencrypt.bats

@@ -88,7 +88,7 @@ function _initial_setup() {
   # All of these certs support both FQDNs (`mail.example.test` and `example.test`),
   # Except for the wildcard cert (`*.example.test`), that was created with `example.test` intentionally excluded from SAN.
   # We want to maintain the same FQDN (`mail.example.test`) between the _acme_ecdsa and _acme_rsa tests.
-  local LOCAL_BASE_PATH="${PWD}/test/test-files/ssl/example.test/with_ca/rsa"
+  local LOCAL_BASE_PATH="${PWD}/test/files/ssl/example.test/with_ca/rsa"
 
   function _prepare() {
     # Default `acme.json` for _acme_ecdsa test:
@@ -240,7 +240,7 @@ function _copy_to_letsencrypt_storage() {
   FQDN_DIR=$(echo "${DEST}" | cut -d '/' -f1)
   mkdir -p "${TEST_TMP_CONFIG}/letsencrypt/${FQDN_DIR}"
 
-  if ! cp "${PWD}/test/test-files/ssl/${SRC}" "${TEST_TMP_CONFIG}/letsencrypt/${DEST}"; then
+  if ! cp "${PWD}/test/files/ssl/${SRC}" "${TEST_TMP_CONFIG}/letsencrypt/${DEST}"; then
     echo "Could not copy cert file '${SRC}'' to '${DEST}'" >&2
     exit 1
   fi

test/tests/parallel/set1/tls/manual.bats

@@ -20,7 +20,7 @@ function setup_file() {
   export TEST_DOMAIN='example.test'
 
   local CUSTOM_SETUP_ARGUMENTS=(
-    --volume "${PWD}/test/test-files/ssl/${TEST_DOMAIN}/with_ca/ecdsa/:/config/ssl/:ro"
+    --volume "${PWD}/test/files/ssl/${TEST_DOMAIN}/with_ca/ecdsa/:/config/ssl/:ro"
     --env LOG_LEVEL='trace'
     --env SSL_TYPE='manual'
     --env TLS_LEVEL='modern'
@@ -108,10 +108,10 @@ function teardown_file() { _default_teardown ; }
 
 @test "manual cert changes are picked up by check-for-changes" {
   printf '%s' 'someThingsChangedHere' \
-    >>"$(pwd)/test/test-files/ssl/${TEST_DOMAIN}/with_ca/ecdsa/key.ecdsa.pem"
+    >>"$(pwd)/test/files/ssl/${TEST_DOMAIN}/with_ca/ecdsa/key.ecdsa.pem"
 
   run timeout 15 docker exec "${CONTAINER_NAME}" bash -c "tail -F /var/log/supervisor/changedetector.log | sed '/Manual certificates have changed/ q'"
   assert_success
 
-  sed -i '/someThingsChangedHere/d' "$(pwd)/test/test-files/ssl/${TEST_DOMAIN}/with_ca/ecdsa/key.ecdsa.pem"
+  sed -i '/someThingsChangedHere/d' "$(pwd)/test/files/ssl/${TEST_DOMAIN}/with_ca/ecdsa/key.ecdsa.pem"
 }

test/tests/parallel/set2/tls_cipherlists.bats

@@ -17,7 +17,7 @@ function setup_file() {
 
   # Contains various certs for testing TLS support (read-only):
   export TLS_CONFIG_VOLUME
-  TLS_CONFIG_VOLUME="${PWD}/test/test-files/ssl/${TEST_DOMAIN}/:/config/ssl/:ro"
+  TLS_CONFIG_VOLUME="${PWD}/test/files/ssl/${TEST_DOMAIN}/:/config/ssl/:ro"
 
   # Used for connecting testssl and DMS containers via network name `TEST_DOMAIN`:
   # NOTE: If the network already exists, the test will fail to start

test/tests/parallel/set3/container_configuration/hostname.bats

@@ -207,7 +207,7 @@ function _should_have_correct_mail_headers() {
   # (eg: OVERRIDE_HOSTNAME or `--hostname mail --domainname example.test`)
   local EXPECTED_HOSTNAME=${3:-${EXPECTED_FQDN}}
 
-  _send_email 'email-templates/existing-user1'
+  _send_email --from 'user@external.tld' 'existing/user1'
   _wait_for_empty_mail_queue_in_container
   _count_files_in_directory_in_container '/var/mail/localhost.localdomain/user1/new/' '1'
 

test/tests/parallel/set3/mta/dsn.bats

@@ -47,9 +47,9 @@ function teardown_file() {
 @test "should always send a DSN when requested" {
   export CONTAINER_NAME=${CONTAINER1_NAME}
 
-  _send_email 'email-templates/dsn-unauthenticated'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/unauthenticated.txt'
-  _send_email 'email-templates/dsn-authenticated' '0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/authenticated.txt' '0.0.0.0 465'
-  _send_email 'email-templates/dsn-authenticated' '0.0.0.0 587'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/authenticated.txt' '0.0.0.0 587'
   _wait_for_empty_mail_queue_in_container
 
   _run_in_container grep "${LOG_DSN}" /var/log/mail/mail.log
@@ -60,7 +60,7 @@ function teardown_file() {
 @test "should only send a DSN when requested from ports 465/587" {
   export CONTAINER_NAME=${CONTAINER2_NAME}
 
-  _send_email 'email-templates/dsn-unauthenticated'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/unauthenticated.txt'
   _wait_for_empty_mail_queue_in_container
 
   # DSN requests can now only be made on ports 465 and 587,
@@ -72,8 +72,8 @@ function teardown_file() {
   assert_failure
 
   # These ports are excluded via master.cf.
-  _send_email 'email-templates/dsn-authenticated' '0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/authenticated.txt' '0.0.0.0 465'
-  _send_email 'email-templates/dsn-authenticated' '0.0.0.0 587'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/authenticated.txt' '0.0.0.0 587'
   _wait_for_empty_mail_queue_in_container
 
   _run_in_container grep "${LOG_DSN}" /var/log/mail/mail.log
@@ -83,9 +83,9 @@ function teardown_file() {
 @test "should never send a DSN" {
   export CONTAINER_NAME=${CONTAINER3_NAME}
 
-  _send_email 'email-templates/dsn-unauthenticated'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/unauthenticated.txt'
-  _send_email 'email-templates/dsn-authenticated' '0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/authenticated.txt' '0.0.0.0 465'
-  _send_email 'email-templates/dsn-authenticated' '0.0.0.0 587'
+  _nc_wrapper '/tmp/docker-mailserver-test/emails/nc_raw/dsn/authenticated.txt' '0.0.0.0 587'
   _wait_for_empty_mail_queue_in_container
 
   # DSN requests are rejected regardless of origin.

test/tests/parallel/set3/mta/lmtp_ip.bats

@@ -38,7 +38,7 @@ function teardown_file() { _default_teardown ; }
 
 @test "delivers mail to existing account" {
   _wait_for_smtp_port_in_container
-  _send_email 'email-templates/existing-user1' # send a test email
+  _send_email 'existing/user1' # send a test email
 
   # Verify delivery was successful, log line should look similar to:
   # postfix/lmtp[1274]: 0EA424ABE7D9: to=<user1@localhost.localdomain>, relay=127.0.0.1[127.0.0.1]:24, delay=0.13, delays=0.07/0.01/0.01/0.05, dsn=2.0.0, status=sent (250 2.0.0 <user1@localhost.localdomain> ixPpB+Zvv2P7BAAAUi6ngw Saved)

test/tests/parallel/set3/mta/privacy.bats

@@ -25,7 +25,7 @@ function teardown_file() { _default_teardown ; }
 
 # this test covers https://github.com/docker-mailserver/docker-mailserver/issues/681
 @test "(Postfix) remove privacy details of the sender" {
-  _run_in_container_bash "openssl s_client -quiet -starttls smtp -connect 0.0.0.0:587 < /tmp/docker-mailserver-test/email-templates/send-privacy-email.txt"
+  _run_in_container_bash "openssl s_client -quiet -starttls smtp -connect 0.0.0.0:587 < /tmp/docker-mailserver-test/emails/privacy.txt"
   assert_success
 
   _run_until_success_or_timeout 120 _exec_in_container_bash '[[ -d /var/mail/localhost.localdomain/user1/new ]]'

test/tests/parallel/set3/mta/smtp_delivery.bats

@@ -63,34 +63,34 @@ function setup_file() {
 
   # TODO: Move to clamav tests (For use when ClamAV is enabled):
   # _repeat_in_container_until_success_or_timeout 60 "${CONTAINER_NAME}" test -e /var/run/clamav/clamd.ctl
-  # _send_email 'email-templates/amavis-virus'
+  # _send_email 'amavis-virus'
 
   # Required for 'delivers mail to existing alias':
-  _send_email 'email-templates/existing-alias-external'
+  _send_email --from user@external.tld --to alias1@localhost.localdomain 'existing/alias-external'
   # Required for 'delivers mail to existing alias with recipient delimiter':
-  _send_email 'email-templates/existing-alias-recipient-delimiter'
+  _send_email --from user@external.tld --to alias1~test@localhost.localdomain 'existing/alias-recipient-delimiter'
   # Required for 'delivers mail to existing catchall':
-  _send_email 'email-templates/existing-catchall-local'
+  _send_email --from user@external.tld --to wildcard@localdomain2.com 'existing/catchall-local'
   # Required for 'delivers mail to regexp alias':
-  _send_email 'email-templates/existing-regexp-alias-local'
+  _send_email --from user@external.tld --to test123@localhost.localdomain 'existing/regexp-alias-local'
 
   # Required for 'rejects mail to unknown user':
-  _send_email 'email-templates/non-existing-user'
+  _send_email --from user@external.tld --to nouser@localhost.localdomain 'non-existing-user'
   # Required for 'redirects mail to external aliases':
-  _send_email 'email-templates/existing-regexp-alias-external'
+  _send_email --from user@external.tld --to bounce-always@localhost.localdomain 'existing/regexp-alias-external'
-  _send_email 'email-templates/existing-alias-local'
+  _send_email --from user@external.tld --to alias2@localhost.localdomain 'existing/alias-local'
   # Required for 'rejects spam':
-  _send_email 'email-templates/amavis-spam'
+  _send_email 'amavis/spam'
 
   # Required for 'delivers mail to existing account':
-  _send_email 'email-templates/existing-user1'
+  _send_email 'existing/user1'
-  _send_email 'email-templates/existing-user2'
+  _send_email --from user@external.tld --to user2@otherdomain.tld 'existing/user2'
-  _send_email 'email-templates/existing-user3'
+  _send_email --from user@external.tld --to user3@localhost.localdomain 'existing/user3'
-  _send_email 'email-templates/existing-added'
+  _send_email --from user@external.tld --to added@localhost.localdomain 'existing/added'
-  _send_email 'email-templates/existing-user-and-cc-local-alias'
+  _send_email --from user@external.tld --to user1@localhost.localdomain 'existing/user-and-cc-local-alias'
-  _send_email 'email-templates/sieve-spam-folder'
+  _send_email --from user@external.tld 'sieve/spam-folder'
-  _send_email 'email-templates/sieve-pipe'
+  _send_email --from user@external.tld --to user2@otherdomain.tld 'sieve/pipe'
-  _run_in_container_bash 'sendmail root < /tmp/docker-mailserver-test/email-templates/root-email.txt'
+  _run_in_container_bash 'sendmail root < /tmp/docker-mailserver-test/emails/sendmail/root-email.txt'
 }
 
 @test "should succeed at emptying mail queue" {
@@ -103,43 +103,43 @@ function setup_file() {
 }
 
 @test "should successfully authenticate with good password (plain)" {
-  _send_email 'auth/smtp-auth-plain' '-w 5 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/smtp-auth-plain.txt' '-w 5 0.0.0.0 465'
   assert_output --partial 'Authentication successful'
 }
 
 @test "should fail to authenticate with wrong password (plain)" {
-  _send_email 'auth/smtp-auth-plain-wrong' '-w 20 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/smtp-auth-plain-wrong.txt' '-w 20 0.0.0.0 465'
   assert_output --partial 'authentication failed'
 }
 
 @test "should successfully authenticate with good password (login)" {
-  _send_email 'auth/smtp-auth-login' '-w 5 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/smtp-auth-login.txt' '-w 5 0.0.0.0 465'
   assert_output --partial 'Authentication successful'
 }
 
 @test "should fail to authenticate with wrong password (login)" {
-  _send_email 'auth/smtp-auth-login-wrong' '-w 20 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/smtp-auth-login-wrong.txt' '-w 20 0.0.0.0 465'
   assert_output --partial 'authentication failed'
 }
 
 @test "[user: 'added'] should successfully authenticate with good password (plain)" {
-  _send_email 'auth/added-smtp-auth-plain' '-w 5 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/added-smtp-auth-plain.txt' '-w 5 0.0.0.0 465'
   assert_output --partial 'Authentication successful'
 }
 
 @test "[user: 'added'] should fail to authenticate with wrong password (plain)" {
-  _send_email 'auth/added-smtp-auth-plain-wrong' '-w 20 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/added-smtp-auth-plain-wrong.txt' '-w 20 0.0.0.0 465'
   assert_output --partial 'authentication failed'
 }
 
 @test "[user: 'added'] should successfully authenticate with good password (login)" {
-  _send_email 'auth/added-smtp-auth-login' '-w 5 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/added-smtp-auth-login.txt' '-w 5 0.0.0.0 465'
   assert_success
   assert_output --partial 'Authentication successful'
 }
 
 @test "[user: 'added'] should fail to authenticate with wrong password (login)" {
-  _send_email 'auth/added-smtp-auth-login-wrong' '-w 20 0.0.0.0 465'
+  _nc_wrapper '/tmp/docker-mailserver-test/auth/added-smtp-auth-login-wrong.txt' '-w 20 0.0.0.0 465'
   assert_output --partial 'authentication failed'
 }
 
@@ -236,12 +236,12 @@ function setup_file() {
 @test "rejects spam" {
   _run_in_container grep 'Blocked SPAM {NoBounceInbound,Quarantined}' /var/log/mail/mail.log
   assert_success
-  assert_output --partial '<spam@external.tld> -> <user1@localhost.localdomain>'
+  assert_output --partial '<example-user@example.test> -> <user1@localhost.localdomain>'
   _should_output_number_of_lines 1
 
   # Amavis log line with SPAMASSASSIN_SPAM_TO_INBOX=0 + grep 'Passed SPAM {RelayedTaggedInbound,Quarantined}' /var/log/mail/mail.log:
   # Amavis log line with SPAMASSASSIN_SPAM_TO_INBOX=1 + grep 'Blocked SPAM {NoBounceInbound,Quarantined}' /var/log/mail/mail.log:
-  # <spam@external.tld> -> <user1@localhost.localdomain>
+  # <example-user@example.test> -> <user1@localhost.localdomain>
   # Amavis log line with ENABLE_SRS=1 changes the domain-part to match in a log:
   # <SRS0=g+ca=5C=external.tld=spam@example.test> -> <user1@localhost.localdomain>
   # assert_output --partial 'external.tld=spam@example.test> -> <user1@localhost.localdomain>'
@@ -258,7 +258,7 @@ function setup_file() {
 # Dovecot does not support SMTPUTF8, so while we can send we cannot receive
 # Better disable SMTPUTF8 support entirely if we can't handle it correctly
 @test "not advertising smtputf8" {
-  _send_email 'email-templates/smtp-ehlo'
+  _send_email 'smtp-ehlo'
   refute_output --partial 'SMTPUTF8'
 }
 

test/tests/parallel/set3/mta/smtponly.bats

@@ -32,7 +32,7 @@ function teardown_file() { _default_teardown ; }
   assert_success
 
   # it looks as if someone tries to send mail to another domain outside of DMS
-  _send_email 'email-templates/smtp-only'
+  _send_email 'smtp-only'
   _wait_for_empty_mail_queue_in_container
 
   # this seemingly succeeds, but looking at the logs, it doesn't

test/tests/serial/mail_with_ldap.bats

@@ -391,7 +391,7 @@ function _should_successfully_deliver_mail_to() {
   local SENDER_ADDRESS='user@external.tld'
   local RECIPIENT_ADDRESS=${1:?Recipient address is required}
   local MAIL_STORAGE_RECIPIENT=${2:?Recipient storage location is required}
-  local MAIL_TEMPLATE='/tmp/docker-mailserver-test/email-templates/test-email.txt'
+  local MAIL_TEMPLATE='/tmp/docker-mailserver-test/emails/test-email.txt'
 
   _run_in_container_bash "sendmail -f ${SENDER_ADDRESS} ${RECIPIENT_ADDRESS} < ${MAIL_TEMPLATE}"
   _wait_for_empty_mail_queue_in_container

test/tests/serial/permit_docker.bats

@@ -13,7 +13,7 @@ setup_file() {
   PRIVATE_CONFIG=$(duplicate_config_for_container . mail_smtponly_second_network)
   docker create --name mail_smtponly_second_network \
     -v "${PRIVATE_CONFIG}":/tmp/docker-mailserver \
-    -v "$(pwd)/test/test-files":/tmp/docker-mailserver-test:ro \
+    -v "$(pwd)/test/files":/tmp/docker-mailserver-test:ro \
     -e SMTP_ONLY=1 \
     -e PERMIT_DOCKER=connected-networks \
     -e OVERRIDE_HOSTNAME=mail.my-domain.com \
@@ -26,7 +26,7 @@ setup_file() {
   PRIVATE_CONFIG=$(duplicate_config_for_container . mail_smtponly_second_network_sender)
   docker run -d --name mail_smtponly_second_network_sender \
     -v "${PRIVATE_CONFIG}":/tmp/docker-mailserver \
-    -v "$(pwd)/test/test-files":/tmp/docker-mailserver-test:ro \
+    -v "$(pwd)/test/files":/tmp/docker-mailserver-test:ro \
     -e SMTP_ONLY=1 \
     -e PERMIT_DOCKER=connected-networks \
     -e OVERRIDE_HOSTNAME=mail.my-domain.com \
@@ -39,7 +39,7 @@ setup_file() {
   # create another container that enforces authentication even on local connections
   docker run -d --name mail_smtponly_force_authentication \
     -v "${PRIVATE_CONFIG}":/tmp/docker-mailserver \
-    -v "$(pwd)/test/test-files":/tmp/docker-mailserver-test:ro \
+    -v "$(pwd)/test/files":/tmp/docker-mailserver-test:ro \
     -e SMTP_ONLY=1 \
     -e PERMIT_DOCKER=none \
     -e OVERRIDE_HOSTNAME=mail.my-domain.com \
@@ -68,7 +68,7 @@ teardown_file() {
   _reload_postfix mail_smtponly_second_network
 
   # we should be able to send from the other container on the second network!
-  run docker exec mail_smtponly_second_network_sender /bin/sh -c "nc mail_smtponly_second_network 25 < /tmp/docker-mailserver-test/email-templates/smtp-only.txt"
+  run docker exec mail_smtponly_second_network_sender /bin/sh -c "nc mail_smtponly_second_network 25 < /tmp/docker-mailserver-test/emails/smtp-only.txt"
   assert_output --partial "250 2.0.0 Ok: queued as "
   repeat_in_container_until_success_or_timeout 60 mail_smtponly_second_network /bin/sh -c 'grep -cE "to=<user2\@external.tld>.*status\=sent" /var/log/mail/mail.log'
 }
@@ -80,7 +80,7 @@ teardown_file() {
   _reload_postfix mail_smtponly_force_authentication
 
   # the mailserver should require authentication and a protocol error should occur when using TLS
-  run docker exec mail_smtponly_force_authentication /bin/sh -c "nc localhost 25 < /tmp/docker-mailserver-test/email-templates/smtp-only.txt"
+  run docker exec mail_smtponly_force_authentication /bin/sh -c "nc localhost 25 < /tmp/docker-mailserver-test/emails/smtp-only.txt"
   assert_output --partial "550 5.5.1 Protocol error"
   [[ ${status} -ge 0 ]]
 }

test/tests/serial/test_helper.bats

@@ -171,7 +171,7 @@ BATS_TEST_NAME_PREFIX='test helper functions:'
   # enable ClamAV to make message delivery slower, so we can detect it
   CONTAINER_NAME=$(docker run -d --rm \
     -v "${PRIVATE_CONFIG}":/tmp/docker-mailserver \
-    -v "$(pwd)/test/test-files":/tmp/docker-mailserver-test:ro \
+    -v "$(pwd)/test/files":/tmp/docker-mailserver-test:ro \
     -e ENABLE_CLAMAV=1 \
     -h mail.my-domain.com \
     -t "${NAME}")
@@ -186,7 +186,7 @@ BATS_TEST_NAME_PREFIX='test helper functions:'
   [[ ${SECONDS} -lt 5 ]]
 
   # fill the queue with a message
-  docker exec "${CONTAINER_NAME}" /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/amavis-virus.txt"
+  docker exec "${CONTAINER_NAME}" /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/emails/amavis-virus.txt"
 
   # that should still be stuck in the queue
   ! TEST_TIMEOUT_IN_SECONDS=0 wait_for_empty_mail_queue_in_container "${CONTAINER_NAME}"
@@ -203,7 +203,7 @@ BATS_TEST_NAME_PREFIX='test helper functions:'
   # enable ClamAV to make message delivery slower, so we can detect it
   CONTAINER_NAME=$(docker run -d --rm \
     -v "${PRIVATE_CONFIG}":/tmp/docker-mailserver \
-    -v "$(pwd)/test/test-files":/tmp/docker-mailserver-test:ro \
+    -v "$(pwd)/test/files":/tmp/docker-mailserver-test:ro \
     -e ENABLE_CLAMAV=1 \
     -h mail.my-domain.com \
     -t "${NAME}")
@@ -213,7 +213,7 @@ BATS_TEST_NAME_PREFIX='test helper functions:'
   wait_for_smtp_port_in_container "${CONTAINER_NAME}" || docker logs "${CONTAINER_NAME}"
 
   # fill the queue with a message
-  docker exec "${CONTAINER_NAME}" /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/amavis-virus.txt"
+  docker exec "${CONTAINER_NAME}" /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/emails/amavis-virus.txt"
 
   # give it some time to clear the queue
   SECONDS=0

test/tests/serial/vmail-id.bats

@@ -20,7 +20,7 @@ function setup_file() {
 function teardown_file() { _default_teardown ; }
 
 @test 'should successfully deliver mail' {
-  _send_email 'email-templates/existing-user1'
+  _send_email 'existing-user1'
   _wait_for_empty_mail_queue_in_container
 
   # Should be successfully sent (received) by Postfix: