From 70ad765a30cd5ce8385994f592f51e05b1e0a744 Mon Sep 17 00:00:00 2001
From: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
Date: Mon, 10 Oct 2022 06:43:39 +1300
Subject: [PATCH] tests(fix): Avoid introducing CRLF into `postfix-accounts.cf`
 during setup (#2820)

Currently a change detection would be triggered and during processing, a CRLF is converted to LF, which updates the `postfix-accounts.cf` file and triggers another change event.

No need for the first approach to add an account, and it is the culprit for causing the CRLF to appear.
---
 test/tests.bats | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/tests.bats b/test/tests.bats
index 60e54bca..b809dbec 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -44,8 +44,8 @@ setup_file() {
   wait_for_finished_setup_in_container mail
 
   # generate accounts after container has been started
-  docker run --rm -e MAIL_USER=added@localhost.localdomain -e MAIL_PASS=mypassword -t "${NAME}" /bin/sh -c 'echo "${MAIL_USER}|$(doveadm pw -s SHA512-CRYPT -u ${MAIL_USER} -p ${MAIL_PASS})"' >> "${PRIVATE_CONFIG}/postfix-accounts.cf"
-  docker exec mail addmailuser pass@localhost.localdomain 'may be \a `p^a.*ssword'
+  docker exec mail setup email add 'added@localhost.localdomain' 'mypassword'
+  docker exec mail setup email add 'pass@localhost.localdomain' 'may be \a `p^a.*ssword'
 
   # setup sieve
   docker cp "${PRIVATE_CONFIG}/sieve/dovecot.sieve" mail:/var/mail/localhost.localdomain/user1/.dovecot.sieve