test

check-for-changes: performance improvements + wait for settle (docker-mailserver#2104) lint fix reverted a mistake whoops, forgot one testing flakey tests reverted stopwaitsecs for postfix (docker-mailserver#2137) more tests more testing Bats developer explains that run_*_file_if_necessary isn't needed since 1.2.1 more test testing more testing more testing docs: Adds a new blog post (docker-mailserver#2138) Adds a new blog post that covers setting up docker-mailserver on a VPS, including but not limited to * Considerations when selecting a VPS * Initial configuration of docker-mailserver * DNS setup and verification of settings * Multiple domains Co-authored-by: Frederic Werner <20406381+wernerfred@users.noreply.github.com> docs: add matrixes as a contributor for blog (docker-mailserver#2139) * docs: update CONTRIBUTORS.md * docs: update .all-contributorsrc * fix: remove projectmanagement * chore: remove projectmanagement Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Frederic Werner <20406381+wernerfred@users.noreply.github.com> added wait for smtp port quick fix quick fix
NorseGaud · Aug 28, 2021 · 1fd29df · 1fd29df
1 parent 35afa09
commit 1fd29df
Show file tree

Hide file tree

Showing 32 changed files with 303 additions and 10 deletions.
diff --git a/.github/workflows/test_merge_requests.yml b/.github/workflows/test_merge_requests.yml
@@ -62,3 +62,57 @@ jobs:
           bash -c 'make generate-accounts tests'
         env:
           CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
+      - name: Run test suite
+        run: >
+          NAME=mailserver-testing:ci
+          bash -c 'make generate-accounts tests'
+        env:
+          CI: true
diff --git a/Makefile b/Makefile
@@ -38,8 +38,7 @@ generate-accounts:
 	@ echo "           # this is also a test comment, :O" >> test/config/postfix-accounts.cf
 
 tests:
-	@ NAME=$(NAME) ./test/bats/bin/bats --trace --verbose-run --show-output-of-succeeding-tests --filter "checking setup.sh" test/tests.bats
-#@ NAME=$(NAME) ./test/bats/bin/bats test/*.bats
+	@ NAME=$(NAME) ./test/bats/bin/bats test/*.bats
 
 .PHONY: ALWAYS_RUN
 test/%.bats: ALWAYS_RUN

diff --git a/target/scripts/postfix-wrapper.sh b/target/scripts/postfix-wrapper.sh
@@ -20,8 +20,7 @@ trap "service postfix stop" SIGINT
 trap "service postfix stop" SIGTERM
 trap "service postfix reload" SIGHUP
 
-service postfix start &
-wait
+service postfix start
 
 # wait until postfix is dead (triggered by trap)
 while kill -0 "$(< /var/spool/postfix/pid/master.pid)"

diff --git a/test/bats b/test/bats
diff --git a/test/mail_dhparams_default.bats b/test/mail_dhparams_default.bats
@@ -11,6 +11,15 @@ load 'test_helper/common'
 #   ~ The file `ffdhe4096.pem` has not been modified (checksum verification).
 #   ~ `ffdhe4096.pem` is copied to the configuration directories for postfix and dovecot.
 
+
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container . mail_default_dhparams_both_one_dir)"

diff --git a/test/mail_dhparams_manual_not_one_dir.bats b/test/mail_dhparams_manual_not_one_dir.bats
@@ -11,6 +11,15 @@ load 'test_helper/common'
 #   ~ User supplied DHE parameters are copied to the configuration directories for postfix and dovecot.
 #   ~ A warning is raised about usage of insecure parameters.
 
+
+function setup() {
+  run_setup_file_if_necessary
+}
+
+function teardown() {
+  run_teardown_file_if_necessary
+}
+
 function setup_file() {
   local PRIVATE_CONFIG
   PRIVATE_CONFIG=$(duplicate_config_for_container .)

diff --git a/test/mail_dhparams_manual_one_dir.bats b/test/mail_dhparams_manual_one_dir.bats
@@ -11,6 +11,14 @@ load 'test_helper/common'
 #   ~ User supplied DHE parameters are copied to the configuration directories for postfix and dovecot.
 #   ~ A warning is raised about usage of insecure parameters.
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_disabled_clamav_spamassassin.bats b/test/mail_disabled_clamav_spamassassin.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+setup() {
+    run_setup_file_if_necessary
+}
+
+teardown() {
+    run_teardown_file_if_necessary
+}
+
 setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_fail2ban.bats b/test/mail_fail2ban.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_fetchmail.bats b/test/mail_fetchmail.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_fetchmail_parallel.bats b/test/mail_fetchmail_parallel.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_lmtp_ip.bats b/test/mail_lmtp_ip.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+setup() {
+    run_setup_file_if_necessary
+}
+
+teardown() {
+    run_teardown_file_if_necessary
+}
+
 setup_file() {
     local PRIVATE_CONFIG PRIVATE_ETC
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_override_hostname.bats b/test/mail_override_hostname.bats
@@ -1,8 +1,8 @@
 load 'test_helper/common'
 
-#function setup() {
-#  run_setup_file_if_necessary
-#}
+function setup() {
+    run_setup_file_if_necessary
+}
 
 function setup_file() {
   local PRIVATE_CONFIG

diff --git a/test/mail_pop3.bats b/test/mail_pop3.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_postscreen.bats b/test/mail_postscreen.bats
@@ -1,10 +1,16 @@
 load 'test_helper/common'
 
 setup() {
+    run_setup_file_if_necessary
+
     # Getting mail container IP
     MAIL_POSTSCREEN_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' mail_postscreen)
 }
 
+teardown() {
+    run_teardown_file_if_necessary
+}
+
 setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_privacy.bats b/test/mail_privacy.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_quotas_disabled.bats b/test/mail_quotas_disabled.bats
@@ -4,6 +4,15 @@ load 'test_helper/common'
 # ---------
 # When ENABLE_QUOTAS is explicitly disabled (ENABLE_QUOTAS=0), dovecot quota must not be enabled.
 
+
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_smtponly.bats b/test/mail_smtponly.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_spam_bounced.bats b/test/mail_spam_bounced.bats
@@ -4,6 +4,15 @@ load 'test_helper/common'
 # ---------
 # When SPAMASSASSIN_SPAM_TO_INBOX=0, spam messages must be bounced.
 
+
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container . mail_spam_bounced_defined)"

diff --git a/test/mail_special_use_folders.bats b/test/mail_special_use_folders.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+setup() {
+    run_setup_file_if_necessary
+}
+
+teardown() {
+    run_teardown_file_if_necessary
+}
+
 setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_ssl_letsencrypt.bats b/test/mail_ssl_letsencrypt.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+  run_setup_file_if_necessary
+}
+
+function teardown() {
+  run_teardown_file_if_necessary
+}
+
 function setup_file() {
   local PRIVATE_CONFIG
 

diff --git a/test/mail_ssl_manual.bats b/test/mail_ssl_manual.bats
@@ -1,6 +1,14 @@
 #!/usr/bin/env bats
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     # Internal copies made by `start-mailserver.sh`:
     export PRIMARY_KEY='/etc/postfix/ssl/key'

diff --git a/test/mail_with_imap.bats b/test/mail_with_imap.bats
@@ -1,6 +1,14 @@
 
 load 'test_helper/common'
 
+setup() {
+    run_setup_file_if_necessary
+}
+
+teardown() {
+    run_teardown_file_if_necessary
+}
+
 setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"

diff --git a/test/mail_with_ldap.bats b/test/mail_with_ldap.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+function setup() {
+    run_setup_file_if_necessary
+}
+
+function teardown() {
+    run_teardown_file_if_necessary
+}
+
 function setup_file() {
     pushd test/docker-openldap/ || return 1
     docker build -f Dockerfile -t ldap --no-cache .

diff --git a/test/mail_with_mdbox.bats b/test/mail_with_mdbox.bats
@@ -1,5 +1,13 @@
 load 'test_helper/common'
 
+setup() {
+    run_setup_file_if_necessary
+}
+
+teardown() {
+    run_teardown_file_if_necessary
+}
+
 setup_file() {
     local PRIVATE_CONFIG
     PRIVATE_CONFIG="$(duplicate_config_for_container .)"