From 2a93cdf9aa4c41d80042d465b067b1a5a35ff66f Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Sun, 9 Feb 2025 18:31:16 +0100
Subject: [PATCH] Ensure tests actually work

---
 tests/compose/core/00_create_users.sh | 11 ++++++-----
 tests/compose/core/01_email_test.sh   |  3 ++-
 tests/compose/core/02_forward_test.sh |  1 +
 tests/compose/core/03_alias_test.sh   |  2 ++
 tests/compose/core/04_reply_test.sh   |  1 +
 towncrier/newsfragments/3587.bugfix   |  1 +
 6 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 towncrier/newsfragments/3587.bugfix

diff --git a/tests/compose/core/00_create_users.sh b/tests/compose/core/00_create_users.sh
index 0bed6baf..6411652b 100755
--- a/tests/compose/core/00_create_users.sh
+++ b/tests/compose/core/00_create_users.sh
@@ -1,12 +1,13 @@
+set -e
 echo "Users tests ..."
 # Should fail, admin is already auto-created
 docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'FooBar' && exit 1
 echo "The above error was intended!"
 # Should not fail, but does nothing; ifmissing mode
-docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'FooBar' --mode=ifmissing || exit 1
+docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'FooBar' --mode=ifmissing
 # Should not fail and update the password; update mode
-docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'password' --mode=update || exit 1
-docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user user mailu.io 'password' || exit 1
-docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user 'user/with/slash' mailu.io 'password' || exit 1
-docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user 'user_UTF8' mailu.io 'pa…ss%e9word€' || exit 1
+docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu admin admin mailu.io 'password' --mode=update
+docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user user mailu.io 'password'
+docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user 'user/with/slash' mailu.io 'password'
+docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu user 'user_UTF8' mailu.io 'pa…ss%e9word€'
 echo "User testing successful!"
diff --git a/tests/compose/core/01_email_test.sh b/tests/compose/core/01_email_test.sh
index 97dd6e4b..e633e961 100755
--- a/tests/compose/core/01_email_test.sh
+++ b/tests/compose/core/01_email_test.sh
@@ -1 +1,2 @@
-python3 tests/email_test.py message-core
\ No newline at end of file
+set -e
+python3 tests/email_test.py message-core
diff --git a/tests/compose/core/02_forward_test.sh b/tests/compose/core/02_forward_test.sh
index 43eb8f99..ee29d6e5 100755
--- a/tests/compose/core/02_forward_test.sh
+++ b/tests/compose/core/02_forward_test.sh
@@ -1,3 +1,4 @@
+set -e
 cat << EOF | docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu config-update -v 1
 users:
   - localpart: forwardinguser
diff --git a/tests/compose/core/03_alias_test.sh b/tests/compose/core/03_alias_test.sh
index 6de31580..730ddee4 100755
--- a/tests/compose/core/03_alias_test.sh
+++ b/tests/compose/core/03_alias_test.sh
@@ -1,3 +1,5 @@
+set -e
+
 cat << EOF | docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu config-update -v 1
 aliases:
   - localpart: alltheusers
diff --git a/tests/compose/core/04_reply_test.sh b/tests/compose/core/04_reply_test.sh
index b2402878..a6004406 100755
--- a/tests/compose/core/04_reply_test.sh
+++ b/tests/compose/core/04_reply_test.sh
@@ -1,3 +1,4 @@
+set -e
 cat << EOF | docker compose -f tests/compose/core/docker-compose.yml exec -T admin flask mailu config-update -v 1
 users:
   - localpart: replyuser
diff --git a/towncrier/newsfragments/3587.bugfix b/towncrier/newsfragments/3587.bugfix
new file mode 100644
index 00000000..9641247b
--- /dev/null
+++ b/towncrier/newsfragments/3587.bugfix
@@ -0,0 +1 @@
+Ensure the tests actually work