Fix a bunch of tests for the mhbuild changes; still more to do.

diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index 043d95ef5a435bc74b6444137775fcb804c9af44..ff9fd40b50dec345e24faa5a15bfeb3637d92abd 100755 (executable)
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -292,6 +292,8 @@ RCPT TO:<recipient@example.com>
 DATA
 To: recipient@example.com
 From: sender8@localhost
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 Message-ID:
 

diff --git a/test/post/test-messageid b/test/post/test-messageid
index 544af6682e8b987cf0c74c680ff8ea21dc4eaee4..6ca8f97ea2b9da6435811a2853e60e802f96d8ee 100755 (executable)
--- a/test/post/test-messageid
+++ b/test/post/test-messageid
@@ -32,6 +32,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test
@@ -122,6 +124,8 @@ cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 Message-ID:
 
@@ -145,6 +149,8 @@ cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 Message-ID:
 

diff --git a/test/post/test-mts b/test/post/test-mts
index afcd1319a20392553c94788658a1b24723effd34..73b9aa112cc1e2bd4c55e6283d09fc30062655e7 100755 (executable)
--- a/test/post/test-mts
+++ b/test/post/test-mts
@@ -30,6 +30,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test
@@ -94,6 +96,8 @@ cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test
@@ -118,6 +122,8 @@ cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test
@@ -141,6 +147,8 @@ cat > "${testname}.expected1" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test
@@ -157,6 +165,8 @@ Subject: Test
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test

diff --git a/test/post/test-post-aliases b/test/post/test-post-aliases
index 62c1863b334b6c57796f351c2a663262dcc559ad..664346df6b6af1afcadc031596bbb76fc5654429 100755 (executable)
--- a/test/post/test-post-aliases
+++ b/test/post/test-post-aliases
@@ -86,6 +86,8 @@ cat >"${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Blind List: ;
 Subject: blind list test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of a blind list.
@@ -106,6 +108,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: Blind List: ;
 Subject: blind list test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of a blind list.
@@ -129,6 +133,8 @@ cat >"${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: "named.list" <one@example.com>, "named.list" <two@example.com>
 Subject: named list test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of a named list.

diff --git a/test/post/test-post-basic b/test/post/test-post-basic
index 74ef5e11ec051754641d098461fa9dad2f432b60..c198007b780c754bfb6fc864a05f9c36ca12da91 100755 (executable)
--- a/test/post/test-post-basic
+++ b/test/post/test-post-basic
@@ -34,6 +34,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test
@@ -84,6 +86,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test

diff --git a/test/post/test-post-bcc b/test/post/test-post-bcc
index e1a635493305471cd4f5c3736991f535d6dd94c4..fe8d5fd9602c66e53e83cc1f6bfd4f136103ff66 100755 (executable)
--- a/test/post/test-post-bcc
+++ b/test/post/test-post-bcc
@@ -51,6 +51,8 @@ From: Mr Nobody <nobody@example.com>
 To: Somebody One <somebody1@example.com>,
     Somebody Two <somebody2@example.com>
 Subject: Test Bcc
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of Bcc recipients.
@@ -71,6 +73,8 @@ From: Mr Nobody <nobody@example.com>
 To: Somebody One <somebody1@example.com>,
     Somebody Two <somebody2@example.com>
 Subject: Test Bcc
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of Bcc recipients.

diff --git a/test/post/test-post-dcc b/test/post/test-post-dcc
index f2bbda60c9ca3630a95aabb68fe5f23be0c64255..d9480da8e7ac3d4764e5dd7eca27e3cf901b5f66 100755 (executable)
--- a/test/post/test-post-dcc
+++ b/test/post/test-post-dcc
@@ -36,6 +36,8 @@ From: Mr Nobody <nobody@example.com>
 To: Somebody One <somebody1@example.com>,
     Somebody Two <somebody2@example.com>
 Subject: Test Dcc
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of Dcc recipients.

diff --git a/test/post/test-post-envelope b/test/post/test-post-envelope
index 7d3288b01caf7966526e77f70b4a22f23b38c808..b9e75cec226cb7d230acb5071b9a2e255258dc05 100755 (executable)
--- a/test/post/test-post-envelope
+++ b/test/post/test-post-envelope
@@ -39,6 +39,8 @@ From: Mr Nobody One <nobody1@example.com>,
 Sender: Mr Nobody Three <nobody3@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Sender test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test of the Sender header.
@@ -73,6 +75,8 @@ From: Mr Nobody One <nobody1@example.com>,
 Sender: Mr Nobody Three <nobody3@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Envelope-From test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a test of the Envelope-From header.
@@ -106,6 +110,8 @@ From: Mr Nobody One <nobody1@example.com>,
       Mr Nobody Two <nobody2@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Envelope-From and Sender test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 Sender: nobody4@example.com
 
@@ -137,6 +143,8 @@ DATA
 From: Mr Nobody One <nobody1@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Solo Envelope-From test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a solo test of the Envelope-From header.
@@ -167,6 +175,8 @@ DATA
 From: Mr Nobody One <nobody1@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Blank Envelope-From test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a blank test of the Envelope-From header.

diff --git a/test/post/test-post-fcc b/test/post/test-post-fcc
index 2fdd9deb70fffb06bc77679dfb54e7d186c2685e..052e3dbf8dc5e8797c9e85767651a40c3731bf68 100755 (executable)
--- a/test/post/test-post-fcc
+++ b/test/post/test-post-fcc
@@ -34,6 +34,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Fcc test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a fcc test
@@ -47,6 +49,8 @@ cat > "${testname}.msg.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Somebody Else <somebody@example.com>
 Subject: Fcc test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is a fcc test

diff --git a/test/post/test-post-group b/test/post/test-post-group
index d5e39ae6a0e685666c0e977af4bdf8942cc28a1a..59134b401b9a306e69bfba572034d3de0308addc 100755 (executable)
--- a/test/post/test-post-group
+++ b/test/post/test-post-group
@@ -33,6 +33,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: our-group: ;
 Subject: Group test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of group recipients.

diff --git a/test/post/test-post-multiple b/test/post/test-post-multiple
index 4fe3e85c099726777f87bf823ded9d8542b34436..f7d1a139f2407515f351339a87645c938088855f 100755 (executable)
--- a/test/post/test-post-multiple
+++ b/test/post/test-post-multiple
@@ -34,6 +34,8 @@ From: Mr Nobody <nobody@example.com>
 To: Somebody One <somebody1@example.com>,
     Somebody Two <somebody2@example.com>
 Subject: Test multiple
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of multiple recipients.