github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

tests(chore): Use REPOSITORY_ROOT export var from Makefile

Browse source 
Allows for using `load` with an absolute path instead of a relative one, which makes it possible to group tests into different directories.

Parallel tests differ slightly, loading the newer `helper/common.bash` and `helper/setup.bash` files instead of the older `test_helper/common.bash` which serial tests continue to use.
This commit is contained in:
Brennan Kinney 2022-11-26 11:37:58 +13:00
parent 2cd534a1ab
commit 835056d707
43 changed files with 50 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/test_helper/common.bash
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
load 'test_helper/bats-support/load' load "${REPOSITORY_ROOT}/test/test_helper/bats-support/load"
load 'test_helper/bats-assert/load' load "${REPOSITORY_ROOT}/test/test_helper/bats-assert/load"
NAME=${NAME:-mailserver-testing:ci} NAME=${NAME:-mailserver-testing:ci}

2
test/test_helper/tls.bash
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Helper methods for testing TLS. # Helper methods for testing TLS.
# `_should_*` methods are useful for common high-level functionality. # `_should_*` methods are useful for common high-level functionality.

3
test/tests/parallel/set1/clamav.bats
View file

@ -1,4 +1,5 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/helper/setup"
load "${REPOSITORY_ROOT}/test/helper/common"
TEST_NAME_PREFIX='ClamAV:' TEST_NAME_PREFIX='ClamAV:'
CONTAINER_NAME='dms-test-clamav' CONTAINER_NAME='dms-test-clamav'

3
test/tests/parallel/set1/default_relay_host.bats
View file

@ -1,4 +1,5 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/helper/setup"
load "${REPOSITORY_ROOT}/test/helper/common"
function setup() { function setup() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

5
test/tests/parallel/set2/spam_bounced.bats
View file

@ -1,6 +1,5 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/helper/setup"
# Globals referenced from `test_helper/common`: load "${REPOSITORY_ROOT}/test/helper/common"
# TEST_NAME
# Can run tests in parallel?: No # Can run tests in parallel?: No
# Shared static container name: TEST_NAME # Shared static container name: TEST_NAME

3
test/tests/parallel/set3/dovecot_inet_protocol.bats
View file

@ -1,4 +1,5 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/helper/setup"
load "${REPOSITORY_ROOT}/test/helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

3
test/tests/parallel/set3/helper-functions.bats
View file

@ -1,4 +1,5 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/helper/setup"
load "${REPOSITORY_ROOT}/test/helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_changedetector.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Note if tests fail asserting against `supervisorctl tail changedetector` output, # Note if tests fail asserting against `supervisorctl tail changedetector` output,
# use `supervisorctl tail -<num bytes> changedetector` instead to increase log output. # use `supervisorctl tail -<num bytes> changedetector` instead to increase log output.

2
test/tests/serial/mail_disabled_clamav_spamassassin.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_dnsbl.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
CONTAINER="mail_dnsbl_enabled" CONTAINER="mail_dnsbl_enabled"
CONTAINER2="mail_dnsbl_disabled" CONTAINER2="mail_dnsbl_disabled"

2
test/tests/serial/mail_fail2ban.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_fetchmail.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_fetchmail_parallel.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_hostname.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {

2
test/tests/serial/mail_lmtp_ip.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG PRIVATE_ETC local PRIVATE_CONFIG PRIVATE_ETC

2
test/tests/serial/mail_pop3.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_postfix_inet.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Test case # Test case
# --------- # ---------

2
test/tests/serial/mail_postscreen.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup() { setup() {
# Getting mail container IP # Getting mail container IP

2
test/tests/serial/mail_privacy.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_quotas_disabled.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Test case # Test case
# --------- # ---------

2
test/tests/serial/mail_smtponly.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
docker run --rm -d --name mail_smtponly \ docker run --rm -d --name mail_smtponly \

2
test/tests/serial/mail_spam_junk_folder.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Test case # Test case
# --------- # ---------

2
test/tests/serial/mail_special_use_folders.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

4
test/tests/serial/mail_ssl_letsencrypt.bats
View file

@ -1,5 +1,5 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
load 'test_helper/tls' load "${REPOSITORY_ROOT}/test/test_helper/tls"
# Globals referenced from `test_helper/common`: # Globals referenced from `test_helper/common`:
# TEST_NAME TEST_FQDN TEST_TMP_CONFIG # TEST_NAME TEST_FQDN TEST_TMP_CONFIG

2
test/tests/serial/mail_ssl_manual.bats
View file

@ -1,5 +1,5 @@
#!/usr/bin/env bats #!/usr/bin/env bats
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
# Internal copies made by `start-mailserver.sh`: # Internal copies made by `start-mailserver.sh`:

2
test/tests/serial/mail_time.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_tls_dhparams.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Test case # Test case
# --------- # ---------

2
test/tests/serial/mail_undef_spam_subject.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup() { function setup() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_with_imap.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_with_ldap.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
pushd test/docker-openldap/ || return 1 pushd test/docker-openldap/ || return 1

2
test/tests/serial/mail_with_mdbox.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_with_postgrey.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_with_postgrey_disabled_by_default.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup() { function setup() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/mail_with_relays.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
# We use a temporary config directory since we'll be dynamically editing # We use a temporary config directory since we'll be dynamically editing

2
test/tests/serial/mail_with_sdbox.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG

2
test/tests/serial/no_container.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
function setup_file() { function setup_file() {
# Fail early if the test image is already running: # Fail early if the test image is already running:

2
test/tests/serial/open_dkim.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
export IMAGE_NAME CONTAINER_NAME TEST_FILE export IMAGE_NAME CONTAINER_NAME TEST_FILE

2
test/tests/serial/permit_docker.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME=non-default-docker-mail-network NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME=non-default-docker-mail-network
setup_file() { setup_file() {

2
test/tests/serial/security_tls_cipherlists.bats
View file

@ -1,5 +1,5 @@
#!/usr/bin/env bats #!/usr/bin/env bats
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Globals ${BATS_TMPDIR} and ${NAME} # Globals ${BATS_TMPDIR} and ${NAME}
# `${NAME}` defaults to `mailserver-testing:ci` # `${NAME}` defaults to `mailserver-testing:ci`

2
test/tests/serial/sedfile.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
CONTAINER='sedfile' CONTAINER='sedfile'
TEST_FILE='/tmp/sedfile-test.txt' TEST_FILE='/tmp/sedfile-test.txt'

2
test/tests/serial/setup-cli.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
# Globals referenced from `test_helper/common`: # Globals referenced from `test_helper/common`:
# TEST_NAME (should match the filename, minus the bats extension) # TEST_NAME (should match the filename, minus the bats extension)

4
test/tests/serial/test_helper.bats
View file

@ -1,6 +1,4 @@
load 'test_helper/bats-support/load' load "${REPOSITORY_ROOT}/test/test_helper/common"
load 'test_helper/bats-assert/load'
load 'test_helper/common'
@test "repeat_until_success_or_timeout returns instantly on success" { @test "repeat_until_success_or_timeout returns instantly on success" {
SECONDS=0 SECONDS=0

2
test/tests/serial/tests.bats
View file

@ -1,4 +1,4 @@
load 'test_helper/common' load "${REPOSITORY_ROOT}/test/test_helper/common"
setup_file() { setup_file() {
local PRIVATE_CONFIG local PRIVATE_CONFIG