Home Explore Help
Sign In
gogsadmin
/
crop-swap-mail-list
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

add missing files and fix tests

Pi 1 year ago
parent
00a593661d
commit
dc6bc14474
4 changed files with 26 additions and 20 deletions
Split View Show Diff Stats
  1. 1 1
      cropswap-members@shandan.one/SUBSCRIBE.eml
  2. 1 1
      cropswap-members@shandan.one/UNSUBSCRIBE.eml
  3. 8 4
      mime-inject.py
  4. 16 14
      tests/test-signup.sh

+ 1 - 1
cropswap-members@shandan.one/SUBSCRIBE.eml
View File 

@@ -1,5 +1,5 @@
 
 <html><head></head><body>
 
-<p>You have been successfully subscribed to the Taupiri Crop Members mailing list.
 
+<p>You have been successfully subscribed to the Taupiri Crop Swap Members mailing list.
 
 <p>Email sent to <a href="mailto:cropswap-members@shandan.one">cropswap-members@shandan.one</a> will be forwarded to all other subscribed members.
 
 <p>When you reply to an email from the mailing list, only the sender will receive it.
 
 <p>If you would like to send an email to all the members, then start a new email thread addressed to: <a href="mailto:cropswap-members@shandan.one">cropswap-members@shandan.one</a>

+ 1 - 1
cropswap-members@shandan.one/UNSUBSCRIBE.eml
View File 

@@ -1,5 +1,5 @@
 
 <html><head></head><body>
 
-<p>You have been successfully unsubscribed from the Taupiri Crop Members mailing list.
 
+<p>You have been successfully unsubscribed from the Taupiri Crop Swap Members mailing list.
 
 <p>You will no longer receive email from <a href="mailto:cropswap-members@shandan.one">cropswap-members@shandan.one</a>.
 
 <p>If you wish to continue receiveing messages from other members, then you may <a href="mailto:cropswap-members@shandan.one?subject=[SUBSCRIBE]">subscribe</a> at any time by sending an email to <a href="mailto:cropswap-members@shandan.one">cropswap-members@shandan.one</a>, with [SUBSCRIBE] as the subject (square brackets included). For example:
 
 <p><pre>

+ 8 - 4
mime-inject.py
View File 

@@ -3,10 +3,14 @@ import sys
 
 import email
 
 
 mailgroup = sys.argv[1]
 
-with open(f'/opt/cropswap/{mailgroup}/banner.html', 'rb') as f:
 
-    html = f.read().decode("utf-8")
 
-with open(f'/opt/cropswap/{mailgroup}/banner.txt', 'rb') as f:
 
-    txt = f.read().decode("utf-8")
 
+try:
 
+    with open(f'/opt/cropswap/{mailgroup}/banner.html', 'rb') as f:
 
+        html = f.read().decode("utf-8")
 
+    with open(f'/opt/cropswap/{mailgroup}/banner.txt', 'rb') as f:
 
+        txt = f.read().decode("utf-8")
 
+except FileNotFoundError:
 
+    html = ''
 
+    txt = ''
 
 
 m = email.message_from_bytes(sys.stdin.buffer.read())

+ 16 - 14
tests/test-signup.sh
View File 

@@ -27,8 +27,9 @@ EOF
 
 	X-GROUP: $group
 
 	X-AUTH: admin
 
 	EOF
 
+	contents=$(file reply.out)
 
+	[[ "$contents" =~ empty ]]
 
 
-	grep 'You have been registered as a member' reply.out
 
 	#cat reply.err
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/alist" > "${group}/alist.txt"
 
 	ls ${group} ; cat ${group}/alist.txt
 
@@ -39,7 +40,7 @@ EOF
 
 	X-GROUP: $group
 
 	EOF
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully subscribed to the Taupiri Crop Swap .* mailing list' reply.out
 
 	grep -Fx 'Admin' "${group}/slist.txt"
 
 	grep -Fx 'admin@mail.com' "${group}/slist.txt"
 
 
@@ -52,7 +53,7 @@ EOF
 
 	${SCRIPTDIR}/cropswap-postmaster.sh UNSUBSCRIBE admin@mail.com <<-EOF 1> reply.out 2> reply.err #|| cat reply.err && exit 1
 
 	X-GROUP: $group
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully unsubscribed from the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fvx 'Admin' "${group}/slist.txt" || ! grep -Fxq 'Admin' "${group}/slist.txt"
 
 	grep -Fvx 'admin@mail.com' "${group}/slist.txt" || ! grep -Fxq 'admin@mail.com' "${group}/slist.txt"
 
@@ -68,7 +69,7 @@ EOF
 
 	To: $group
 
 	Subject: [SUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully subscribed to the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fx 'Admin' "${group}/slist.txt"
 
 	grep -Fx 'admin@mail.com' "${group}/slist.txt"
 
@@ -78,7 +79,7 @@ EOF
 
 	To: $group
 
 	Subject: [SUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully subscribed to the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fx 'Admin' "${group}/slist.txt"
 
 	grep -Fx 'admin@mail.com' "${group}/slist.txt"
 
@@ -88,7 +89,7 @@ EOF
 
 	To: $group
 
 	Subject: [UNSUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully unsubscribed from the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fvx 'Admin' "${group}/slist.txt" || ! grep -Fxq 'Admin' "${group}/slist.txt"
 
 	grep -Fvx 'admin@mail.com' "${group}/slist.txt" || ! grep -Fxq 'admin@mail.com' "${group}/slist.txt"
 
@@ -98,7 +99,7 @@ EOF
 
 	To: $group
 
 	Subject: [UNSUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully unsubscribed from the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fvx 'Admin' "${group}/slist.txt" || ! grep -Fxq 'Admin' "${group}/slist.txt"
 
 	grep -Fvx 'admin@mail.com' "${group}/slist.txt" || ! grep -Fxq 'admin@mail.com' "${group}/slist.txt"
 
@@ -108,7 +109,8 @@ EOF
 
 	X-GROUP-ALIAS: $alias
 
 	X-GROUP: $group
 
 	EOF
 
-	grep 'You have been registered as a member' reply.out
 
+	contents=$(file reply.out)
 
+	[[ "$contents" =~ empty ]]
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/alist" > "${group}/alist.txt"
 
 	! grep -Fx 'Non-admin' "${group}/alist.txt"
 
 	! grep -Fx 'non-admin@mail.com' "${group}/alist.txt"
 
@@ -116,7 +118,7 @@ EOF
 
 	${SCRIPTDIR}/cropswap-postmaster.sh SUBSCRIBE non-admin@mail.com <<-EOF 1> reply.out 2> reply.err
 
 	X-GROUP: $group
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully subscribed to the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fx 'Non-admin' "${group}/slist.txt"
 
 	grep -Fx 'non-admin@mail.com' "${group}/slist.txt"
 
@@ -130,7 +132,7 @@ EOF
 
 	${SCRIPTDIR}/cropswap-postmaster.sh UNSUBSCRIBE non-admin@mail.com <<-EOF 1> reply.out 2> reply.err
 
 	X-GROUP: $group
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully unsubscribed from the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fvx 'Non-admin' "${group}/slist.txt" || ! grep -Fqx 'Non-admin' "${group}/slist.txt"
 
 	grep -Fvx 'non-admin@mail.com' "${group}/slist.txt" || ! grep -Fqx 'non-admin@mail.com' "${group}/slist.txt"
 
@@ -146,7 +148,7 @@ EOF
 
 	To: $group
 
 	Subject: [SUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully subscribed to the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fx 'Non-admin' "${group}/slist.txt"
 
 	grep -Fx 'non-admin@mail.com' "${group}/slist.txt"
 
@@ -156,7 +158,7 @@ EOF
 
 	To: $group
 
 	Subject: [SUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully subscribed to the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fx 'Non-admin' "${group}/slist.txt"
 
 	grep -Fx 'non-admin@mail.com' "${group}/slist.txt"
 
@@ -166,7 +168,7 @@ EOF
 
 	To: $group
 
 	Subject: [UNSUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully unsubscribed from the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fvx 'Non-admin' "${group}/slist.txt" || ! grep -Fxq 'Non-admin' "${group}/slist.txt"
 
 	grep -Fvx 'non-admin@mail.com' "${group}/slist.txt" || ! grep -Fxq 'non-admin@mail.com' "${group}/slist.txt"
 
@@ -176,7 +178,7 @@ EOF
 
 	To: $group
 
 	Subject: [UNSUBSCRIBE]
 
 	EOF
 
-	grep 'Your subscription status has been updated successfully' reply.out
 
+	grep 'You have been successfully unsubscribed from the Taupiri Crop Swap .* mailing list' reply.out
 
 	${SCRIPTDIR}/gdbm-iter-subscribed.py "${group}/mlist" "${group}/slist" > "${group}/slist.txt"
 
 	grep -Fvx 'Non-admin' "${group}/slist.txt" || ! grep -Fxq 'Non-admin' "${group}/slist.txt"
 
 	grep -Fvx 'non-admin@mail.com' "${group}/slist.txt" || ! grep -Fxq 'non-admin@mail.com' "${group}/slist.txt"