From c008ce6608ec3016d29013ef5b7f7c2addac6555 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Sat, 8 Apr 2023 12:47:41 +0200
Subject: [PATCH] review

---
 .github/workflows/build_test_deploy.yml |  5 +++--
 tests/compose/core/05_connectivity.py   | 14 ++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index d18b5882..10c248d7 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -576,7 +576,8 @@ jobs:
           issue: "${{ steps.changelog.outputs.issue }}"
           changelog: "${{ steps.changelog.outputs.content }}"
         run: |
-            cat << "EOT" >> release_note.md
+            EOT=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+            cat << "${EOT}" >> release_note.md
             Changelog :mailbox:
             ---------
             + ${{ env.changelog }}
@@ -590,7 +591,7 @@ jobs:
             The main version X.Y (e.g. 1.9) will always reflect the latest version of the branch. To update your Mailu installation simply pull the latest images \`docker compose pull && docker compose up -d\`.
 
             The pinned version X.Y.Z (e.g. 1.9.1) is not updated. It is pinned to the commit that was used for creating this release. You can use a pinned version to make sure your Mailu installation is not suddenly updated when recreating containers. The pinned version allows the user to manually update. It also allows to go back to a previous pinned version.
-            EOT
+            ${EOT}
       - name: Show release note
         shell: bash
         run: |
diff --git a/tests/compose/core/05_connectivity.py b/tests/compose/core/05_connectivity.py
index 8b94f4c2..e585292a 100755
--- a/tests/compose/core/05_connectivity.py
+++ b/tests/compose/core/05_connectivity.py
@@ -28,7 +28,7 @@ def test_imap(server, username, password):
         print(f'Authenticating to imap://{username}:{password}@{server}:143/ worked without STARTTLS!')
         os.exit(102)
     except imaplib.IMAP4.error:
-        print('NOK')
+        print('NOK - expected')
 
 def test_pop3(server, username, password):
     print(f'Authenticating to pop3s://{username}:{password}@{server}:995/')
@@ -56,7 +56,7 @@ def test_pop3(server, username, password):
         print(f'Authenticating to pop3://{username}:{password}@{server}:110/ worked without STARTTLS!')
         os.exit(103)
     except poplib.error_proto:
-        print('NOK')
+        print('NOK - expected')
 
 def test_SMTP(server, username, password):
     print(f'Authenticating to smtps://{username}:{password}@{server}:465/')
@@ -76,8 +76,9 @@ def test_SMTP(server, username, password):
         with smtplib.SMTP(server, 587) as conn:
             conn.ehlo()
             conn.login(username, password)
+            print(f'Authenticating to smtp://{username}:{password}@{server}:587/ worked!')
     except smtplib.SMTPNotSupportedError:
-        print('NOK')
+        print('NOK - expected')
     #port 25 should fail
     try:
         print(f'Authenticating to smtps://{username}:{password}@{server}:25/')
@@ -86,17 +87,18 @@ def test_SMTP(server, username, password):
             conn.starttls()
             conn.ehlo()
             conn.login(username, password)
+            print(f'Authenticating to smtps://{username}:{password}@{server}:25/ worked!')
     except smtplib.SMTPNotSupportedError:
-        print('NOK')
+        print('NOK - expected')
     try:
         print(f'Authenticating to smtp://{username}:{password}@{server}:25/')
         with smtplib.SMTP(server) as conn:
             conn.ehlo()
             conn.login(username, password)
-            print(f'Authenticating to smtp://{username}:{password}@{server}:587/ worked without STARTTLS!')
+            print(f'Authenticating to smtp://{username}:{password}@{server}:25/ worked without STARTTLS!')
             os.exit(104)
     except smtplib.SMTPNotSupportedError:
-        print('NOK')
+        print('NOK - expected')
 
 if __name__ == '__main__':
     test_imap(SERVER, USERNAME, PASSWORD)