cleaned up >/dev/nulls in Dockerfile and replaced em dashes with normal dashes (#2024)

This commit is contained in:
Georg Lauterbach 2021-06-08 03:20:20 +02:00 committed by GitHub
parent ac450f641f
commit e7b88d865b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 151 additions and 151 deletions

View file

@ -18,35 +18,35 @@ trap '__log_err "${FUNCNAME[0]:-?}" "${BASH_COMMAND:-?}" ${LINENO:-?} ${?:-?}' E
function __log_err
{
printf "\n \e[1m\e[31mUNCHECKED ERROR\e[0m\n%s\n%s\n%s\n%s\n\n" \
" script = ${SCRIPT:-${0}}" \
" function = ${1} / ${2}" \
" line = ${3}" \
" exit code = ${4}"
printf "\n--- \e[1m\e[31mUNCHECKED ERROR\e[0m\n%s\n%s\n%s\n%s\n\n" \
" - script = ${SCRIPT:-${0}}" \
" - function = ${1} / ${2}" \
" - line = ${3}" \
" - exit code = ${4}"
}
function __log_info
{
printf "\n \e[34m%s\e[0m\n%s\n%s\n\n" \
printf "\n--- \e[34m%s\e[0m\n%s\n%s\n\n" \
"${SCRIPT:-${0}}" \
" type = INFO" \
" version = ${*}"
" - type = INFO" \
" - version = ${*}"
}
function __log_failure
{
printf "\n \e[91m%s\e[0m\n%s\n%s\n\n" \
printf "\n--- \e[91m%s\e[0m\n%s\n%s\n\n" \
"${SCRIPT:-${0}}" \
" type = FAILURE" \
" message = ${*:-errors encountered}"
" - type = FAILURE" \
" - message = ${*:-errors encountered}"
}
function __log_success
{
printf "\n \e[32m%s\e[0m\n%s\n%s\n\n" \
printf "\n--- \e[32m%s\e[0m\n%s\n%s\n\n" \
"${SCRIPT}" \
" type = SUCCESS" \
" message = no errors detected"
" - type = SUCCESS" \
" - message = no errors detected"
}
function __in_path

View file

@ -41,9 +41,9 @@ function teardown_file
docker rm -f "${CONTAINER_NAME}"
}
#
# Actual Tests
#
# -----------------------------------------------
# --- Actual Tests ------------------------------
# -----------------------------------------------
@test "${TEST_FILE}/etc/opendkim/KeyTable should contain 2 entries" {
run docker exec "${CONTAINER_NAME}" /bin/bash -c "cat /etc/opendkim/KeyTable | wc -l"
@ -400,7 +400,7 @@ function teardown_file
"grep 'domain1.tld' /etc/opendkim/KeyTable | wc -l"
assert_success
assert_output 1
# Check valid entries actually present in SigningTable
run docker run --rm \
-v "${PRIVATE_CONFIG}/with-selector/opendkim":/etc/opendkim \

View file

@ -935,9 +935,9 @@ EOF
assert_output "passdb: pass@localhost.localdomain auth succeeded"
}
#
# setup.sh
#
# -----------------------------------------------
# --- setup.sh ----------------------------------
# -----------------------------------------------
@test "setup.sh :: exit with error when no arguments provided" {
run ./setup.sh