mlmmj-process: add tests for customheaders

diff --git a/tests/mlmmj-receive.sh b/tests/mlmmj-receive.sh
index 646e7cc957981479ff6c846635ae798dd887eac8..ef6b3163a9cef06013f9d68f2577e42f416e3d80 100755 (executable)
--- a/tests/mlmmj-receive.sh
+++ b/tests/mlmmj-receive.sh
@@ -22,7 +22,8 @@ tests_init \
        maxmailsize \
        maxmailsize0 \
        normail_email \
-       delheaders
+       delheaders \
+       customheaders
 
 mlmmjreceive=$(command -v mlmmj-receive)
 
@@ -2485,13 +2486,56 @@ Subject: yeah
 Let's go, first email
 EOF
 
-cat > nosubject <<EOF
+       atf_check -s exit:0 $mlmmjreceive -L list -F <first
+       cat >> expected-1.txt <<EOF
+EHLO heloname\r
+MAIL FROM:<test+bounces-1-user=test@mlmmjtest>\r
+RCPT TO:<user@test>\r
+DATA\r
+From: bob@test\r
+To: test@mlmmjtest\r
+Subject: yeah\r
+\r
+Let's go, first email\r
+\r
+.\r
+MAIL FROM:<test+bounces-1-user2=test@mlmmjtest>\r
+RCPT TO:<user2@test>\r
+DATA\r
+From: bob@test\r
+To: test@mlmmjtest\r
+Subject: yeah\r
+\r
+Let's go, first email\r
+\r
+.\r
+QUIT\r
+EOF
+       atf_check -o file:expected-1.txt sed -e "/^Message-ID:/d; /^Date:/d;" mail-1.txt
+}
+
+customheaders_body()
+{
+       atf_check $srcdir/fakesmtpd
+       trap kill_fakesmtp EXIT TERM
+       init_ml list
+       rmdir list/text
+       ln -s ${srcdir}/../listtexts/en list/text
+       echo test@mlmmjtest > list/control/listaddress
+       echo "25678" > list/control/smtpport
+       echo "heloname" > list/control/smtphelo
+       printf "X-H1: test\nNope: really not\n" > list/control/customheaders
+
+       printf "user@test\nuser2@test" > list/subscribers.d/u
+cat > first <<EOF
 From: bob@test
 To: test@mlmmjtest
 Return-path: bob@test
+Subject: yeah
 
 Let's go, first email
 EOF
+
        atf_check -s exit:0 $mlmmjreceive -L list -F <first
        cat >> expected-1.txt <<EOF
 EHLO heloname\r
@@ -2501,6 +2545,8 @@ DATA
 From: bob@test\r
 To: test@mlmmjtest\r
 Subject: yeah\r
+X-H1: test\r
+Nope: really not\r
 \r
 Let's go, first email\r
 \r
@@ -2511,6 +2557,8 @@ DATA
 From: bob@test\r
 To: test@mlmmjtest\r
 Subject: yeah\r
+X-H1: test\r
+Nope: really not\r
 \r
 Let's go, first email\r
 \r
@@ -2518,4 +2566,46 @@ Let's go, first email
 QUIT\r
 EOF
        atf_check -o file:expected-1.txt sed -e "/^Message-ID:/d; /^Date:/d;" mail-1.txt
+cat > second <<EOF
+From: bob@test
+To: test@mlmmjtest
+Return-path: bob@test
+Mime: really
+Subject: yeah
+
+Let's go, first email
+EOF
+
+       atf_check -s exit:0 $mlmmjreceive -L list -F <second
+       cat >> expected-2.txt <<EOF
+EHLO heloname\r
+MAIL FROM:<test+bounces-1-user=test@mlmmjtest>\r
+RCPT TO:<user@test>\r
+DATA\r
+From: bob@test\r
+To: test@mlmmjtest\r
+X-H1: test\r
+Nope: really not\r
+Mime: really\r
+Subject: yeah\r
+\r
+Let's go, first email\r
+\r
+.\r
+MAIL FROM:<test+bounces-1-user2=test@mlmmjtest>\r
+RCPT TO:<user2@test>\r
+DATA\r
+From: bob@test\r
+To: test@mlmmjtest\r
+X-H1: test\r
+Nope: really not\r
+Mime: really\r
+Subject: yeah\r
+\r
+Let's go, first email\r
+\r
+.\r
+QUIT\r
+EOF
+       atf_check -o file:expected-2.txt sed -e "/^Message-ID:/d; /^Date:/d;" mail-2.txt
 }