From 5884f866d3b6863946869c036939f8e271417bdb Mon Sep 17 00:00:00 2001 From: Martin Schulze Date: Tue, 20 Oct 2020 09:33:14 +0200 Subject: [PATCH] Fix duplicate configuration name clashes --- test/tests.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/tests.bats b/test/tests.bats index 2411634c..e99f3f8a 100644 --- a/test/tests.bats +++ b/test/tests.bats @@ -573,7 +573,7 @@ EOF @test "checking opendkim: generator creates keys, tables and TrustedHosts without postfix-accounts.cf" { local PRIVATE_CONFIG - PRIVATE_CONFIG="$(duplicate_config_for_container . mail_dkim_generator_creates_keys_tables_TrustedHosts_without_postfix_accounts.cf)" + PRIVATE_CONFIG="$(duplicate_config_for_container . )" rm -rf "${PRIVATE_CONFIG}/without-accounts" mkdir -p "${PRIVATE_CONFIG}/without-accounts" run docker run --rm \ @@ -604,7 +604,7 @@ EOF @test "checking opendkim: generator creates keys, tables and TrustedHosts without postfix-virtual.cf" { local PRIVATE_CONFIG - PRIVATE_CONFIG="$(duplicate_config_for_container . mail_dkim_generator_creates_keys_tables_TrustedHosts_without_postfix_virtual.cf)" + PRIVATE_CONFIG="$(duplicate_config_for_container . )" rm -rf "${PRIVATE_CONFIG}/without-virtual" mkdir -p "${PRIVATE_CONFIG}/without-virtual" run docker run --rm \ @@ -635,7 +635,7 @@ EOF @test "checking opendkim: generator creates keys, tables and TrustedHosts using domain name" { local PRIVATE_CONFIG - PRIVATE_CONFIG="$(duplicate_config_for_container . mail_dkim_generator_creates_keys_tables_TrustedHosts_without_postfix_virtual.cf)" + PRIVATE_CONFIG="$(duplicate_config_for_container . )" rm -rf "${PRIVATE_CONFIG}/with-domain" && mkdir -p "${PRIVATE_CONFIG}/with-domain" run docker run --rm \ -v "${PRIVATE_CONFIG}/with-domain/":/tmp/docker-mailserver/ \