mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-08-29 22:30:27 +02:00
chore: fix various typos across codebase (#4552)
Some checks failed
Lint / lint (push) Waiting to run
Build, Test & Deploy / Build AMD64 Image (push) Has been cancelled
Documentation / Deploy Docs (push) Has been cancelled
Build, Test & Deploy / Test AMD64 Image (push) Has been cancelled
Build, Test & Deploy / Publish AMD64 and ARM64 Image (push) Has been cancelled
Documentation / Update `versions.json` if necessary (push) Has been cancelled
Documentation / update `latest` symlink if necessary (push) Has been cancelled
Some checks failed
Lint / lint (push) Waiting to run
Build, Test & Deploy / Build AMD64 Image (push) Has been cancelled
Documentation / Deploy Docs (push) Has been cancelled
Build, Test & Deploy / Test AMD64 Image (push) Has been cancelled
Build, Test & Deploy / Publish AMD64 and ARM64 Image (push) Has been cancelled
Documentation / Update `versions.json` if necessary (push) Has been cancelled
Documentation / update `latest` symlink if necessary (push) Has been cancelled
Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
This commit is contained in:
parent
060bf9a474
commit
c1a5eabc94
29 changed files with 37 additions and 36 deletions
|
@ -30,7 +30,7 @@ function _wait_until_expected_count_is_matched() {
|
|||
}
|
||||
|
||||
# WARNING: Keep in mind it is a '>=' comparison.
|
||||
# If you provide an explict count to match, ensure it is not too low to cause a false-positive.
|
||||
# If you provide an explicit count to match, ensure it is not too low to cause a false-positive.
|
||||
function __has_expected_count() {
|
||||
# shellcheck disable=SC2317
|
||||
[[ $(__get_count) -ge "${EXPECTED_COUNT}" ]]
|
||||
|
|
|
@ -15,7 +15,7 @@ load "${REPOSITORY_ROOT}/test/helper/common"
|
|||
|
||||
# For certs actually provisioned from LetsEncrypt the Root CA cert should not need to be provided,
|
||||
# as it would already be available by default in `/etc/ssl/certs`, requiring only the cert chain (fullchain.pem).
|
||||
function _should_succesfully_negotiate_tls() {
|
||||
function _should_successfully_negotiate_tls() {
|
||||
local FQDN=${1}
|
||||
# shellcheck disable=SC2031
|
||||
local CA_CERT=${2:-${TEST_CA_CERT}}
|
||||
|
|
|
@ -2,7 +2,7 @@ load "${REPOSITORY_ROOT}/test/helper/setup"
|
|||
load "${REPOSITORY_ROOT}/test/helper/common"
|
||||
|
||||
BATS_TEST_NAME_PREFIX='[ClamAV + SA] (disabled) '
|
||||
CONTAINER_NAME='dms-test_clamav-spamassasin_disabled'
|
||||
CONTAINER_NAME='dms-test_clamav-spamassassin_disabled'
|
||||
|
||||
function setup_file() {
|
||||
_init_with_defaults
|
||||
|
|
|
@ -194,7 +194,7 @@ function __create_key() {
|
|||
local KEYSIZE=${4:-2048}
|
||||
local FORCE=${5:-}
|
||||
|
||||
# Not quoting is intended here as we would othewise provide
|
||||
# Not quoting is intended here as we would otherwise provide
|
||||
# the argument "''" (empty string), which would cause errors
|
||||
# shellcheck disable=SC2086
|
||||
_run_in_container setup config dkim ${FORCE} \
|
||||
|
|
|
@ -45,7 +45,7 @@ function _initial_setup() {
|
|||
|
||||
# Test that certificate files exist for the configured `hostname`:
|
||||
_should_have_valid_config "${TARGET_DOMAIN}" 'privkey.pem' 'fullchain.pem'
|
||||
_should_succesfully_negotiate_tls "${TARGET_DOMAIN}"
|
||||
_should_successfully_negotiate_tls "${TARGET_DOMAIN}"
|
||||
_should_not_support_fqdn_in_cert 'example.test'
|
||||
}
|
||||
|
||||
|
@ -65,7 +65,7 @@ function _initial_setup() {
|
|||
|
||||
#test domain has certificate files
|
||||
_should_have_valid_config "${TARGET_DOMAIN}" 'privkey.pem' 'fullchain.pem'
|
||||
_should_succesfully_negotiate_tls "${TARGET_DOMAIN}"
|
||||
_should_successfully_negotiate_tls "${TARGET_DOMAIN}"
|
||||
_should_not_support_fqdn_in_cert 'mail.example.test'
|
||||
}
|
||||
|
||||
|
@ -148,7 +148,7 @@ function _initial_setup() {
|
|||
# The difference in support is:
|
||||
# - `example.test` should no longer be valid.
|
||||
# - `mail.example.test` should remain valid, but also allow any other subdomain/hostname.
|
||||
_should_succesfully_negotiate_tls 'mail.example.test'
|
||||
_should_successfully_negotiate_tls 'mail.example.test'
|
||||
_should_support_fqdn_in_cert 'fake.example.test'
|
||||
_should_not_support_fqdn_in_cert 'example.test'
|
||||
}
|
||||
|
|
|
@ -198,7 +198,7 @@ function get_cipherlist() {
|
|||
local TLS_VERSION=$1
|
||||
|
||||
if [[ ${TLS_VERSION} == "TLSv1_3" ]]; then
|
||||
# TLS v1.3 cipher suites are not user defineable and not unique to the available certificate(s).
|
||||
# TLS v1.3 cipher suites are not user definable and not unique to the available certificate(s).
|
||||
# They do not support server enforced order either.
|
||||
echo '"TLS_AES_256_GCM_SHA384 TLS_CHACHA20_POLY1305_SHA256 TLS_AES_128_GCM_SHA256"'
|
||||
else
|
||||
|
|
|
@ -159,7 +159,7 @@ function _should_restart_when_killed() {
|
|||
|
||||
# Should kill the process successfully:
|
||||
# (which should then get restarted by supervisord)
|
||||
# NOTE: The process name from `pkill --echo` does not always match the equivalent processs name from `pgrep --list-full`.
|
||||
# NOTE: The process name from `pkill --echo` does not always match the equivalent process name from `pgrep --list-full`.
|
||||
# The oldest process returned (if multiple) should be the top-level process launched by supervisord,
|
||||
# the PID will verify the target process was killed correctly:
|
||||
local PID=$(_exec_in_container pgrep --full --oldest "${PROCESS}")
|
||||
|
|
|
@ -117,7 +117,7 @@ function teardown_file() { _default_teardown ; }
|
|||
assert_success
|
||||
|
||||
# NOTE: Sometimes the directory still exists, possibly from change detection
|
||||
# of the previous test (`email udpate`) triggering. Therefore, the function
|
||||
# of the previous test (`email update`) triggering. Therefore, the function
|
||||
# `wait_until_change_detection_event_completes was added to the
|
||||
# `setup.sh email update` test.
|
||||
_repeat_in_container_until_success_or_timeout 60 "${CONTAINER_NAME}" bash -c '[[ ! -d /var/mail/example.com/user ]]'
|
||||
|
|
|
@ -122,7 +122,7 @@ function setup_file() {
|
|||
|
||||
# Extra ENV needed to support specific test-cases:
|
||||
local ENV_SUPPORT=(
|
||||
# Required for openssl commands to be successul:
|
||||
# Required for openssl commands to be successful:
|
||||
# NOTE: snakeoil cert is created (for `docker-mailserver.invalid`) via Debian post-install script for Postfix package.
|
||||
# TODO: Use proper TLS cert
|
||||
--env SSL_TYPE='snakeoil'
|
||||
|
@ -404,7 +404,7 @@ function _should_exist_in_ldap_tables() {
|
|||
# Each LDAP config file sets `query_filter` to lookup a key in LDAP (values defined in `.ldif` test files)
|
||||
# `mail` (ldap-users), `mailAlias` (ldap-aliases), `mailGroupMember` (ldap-groups)
|
||||
# `postmap` is queried with the mail account address, and the LDAP service should respond with
|
||||
# `result_attribute` which is the LDAP `mail` value (should match what we'r'e quering `postmap` with)
|
||||
# `result_attribute` which is the LDAP `mail` value (should match what we'r'e querying `postmap` with)
|
||||
|
||||
_run_in_container postmap -q "${MAIL_ACCOUNT}" ldap:/etc/postfix/ldap-users.cf
|
||||
assert_success
|
||||
|
|
|
@ -68,7 +68,7 @@ function setup() {
|
|||
assert_output 'foo bar'
|
||||
}
|
||||
|
||||
@test 'checking sedfile substitude failure (strict)' {
|
||||
@test 'checking sedfile substitute failure (strict)' {
|
||||
# try to change 'baz' to 'something' and fail
|
||||
_run_in_container sedfile --strict -i 's|baz|something|' "${TEST_FILE}"
|
||||
assert_failure
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue