Added Message-Id to messages in test suite.

[mmh] / test / mhbuild / test-forw

diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw
index 448a17c..7326b51 100755 (executable)
--- a/test/mhbuild/test-forw
+++ b/test/mhbuild/test-forw
@@ -26,12 +26,6 @@ Subject:
 EOF
 }
 
-# Munge the Content-Id from the draft after mhbuild, so we have a reliable
-# value to check.
-mungedraft() {
-    sed 's/\(Content-ID:\) <[^>][^>]*>/\1 <TESTID>/' $draft > $actual
-}
-
 draft="$MH_TEST_DIR/$$.draft"
 draftorig="$MH_TEST_DIR/,$$.draft.orig"
 expected="$MH_TEST_DIR/$$.expected"
@@ -45,7 +39,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 ------- =_aaaaaaaaaa0
@@ -54,6 +47,7 @@ Content-Type: message/rfc822
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 
 This is message number 1
@@ -64,6 +58,7 @@ Content-Type: message/rfc822
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
 Subject: Testing message 2
 
 This is message number 2
@@ -72,9 +67,8 @@ This is message number 2
 EOF
 mkdraft
 mhbuild $draft
-mungedraft
-check $expected $actual
-test ${failed:-0} -eq 0  &&  rm "$draft" "$draftorig"
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
 # check mhbuild -rfc934
 cat > $expected <<EOF
@@ -84,7 +78,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 
@@ -93,6 +86,7 @@ Content-Description: forwarded messages
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 
 This is message number 1
@@ -102,6 +96,7 @@ This is message number 1
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
 Subject: Testing message 2
 
 This is message number 2
@@ -110,8 +105,7 @@ This is message number 2
 EOF
 mkdraft
 mhbuild -rfc934 $draft
-mungedraft
-check $expected $actual
-test ${failed:-0} -eq 0  &&  rm "$draft" "$draftorig"
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
 exit $failed