💚(ci) also save Dimail logs from E2E test runs

To help debug with Dimail interop, save logs from the Dimail container.
numerique-gouv · Nov 12, 2024 · 743a6a5 · 743a6a5
1 parent 7037446
commit 743a6a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/people.yml b/.github/workflows/people.yml
@@ -207,6 +207,10 @@ jobs:
         if: always()
         run: docker compose logs > src/frontend/apps/e2e/report/logs.txt
 
+      - name: Save Dimail logs
+        if: always()
+        run: docker compose logs > src/frontend/apps/e2e/report/dimail-logs.txt
+
       - uses: actions/upload-artifact@v4
         if: always()
         with:

diff --git a/src/backend/mailbox_manager/utils/dimail.py b/src/backend/mailbox_manager/utils/dimail.py
@@ -1,10 +1,7 @@
 """A minimalist client to synchronize with mailbox provisioning API."""
 
-<<<<<<< HEAD
 import ast
-=======
 import json
->>>>>>> 3617ab6 (🐛(dimail) fix unexpected status_code for proper debug)
 import smtplib
 from email.errors import HeaderParseError, NonASCIILocalPartDefect
 from email.headerregistry import Address