Sanitized the bounce test data.

1 files changed, 13 insertions, 55 deletions

diff --git a/tests/bounces/smtp32_01.txt b/tests/bounces/smtp32_01.txt
index decf0ddc..17b81c42 100644
--- a/tests/bounces/smtp32_01.txt
+++ b/tests/bounces/smtp32_01.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Monday" "2" "April" "101" "04:20:10" "CST" "Postmaster" "postmaster@208.24.118.205" nil "48" "Undeliverable Mail" "^From:" nil nil "4" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-users-admin@python.org>
-Delivered-To: bwarsaw@wooz.org
-Received: from digicool.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
-	by mail.wooz.org (Postfix) with ESMTP id B42DFD3757
-	for <barry@wooz.org>; Mon,  2 Apr 2001 06:21:39 -0400 (EDT)
+Delivered-To: userw@example.org
+Received: from example.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
+	by mail.example.org (Postfix) with ESMTP id B42DFD3757
+	for <usery@example.org>; Mon,  2 Apr 2001 06:21:39 -0400 (EDT)
 Received: from <mailman-users-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1746977; Mon, 02 Apr 2001 06:23:54 -0400
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1746976 for barry@mail.digicool.com; Mon, 02 Apr 2001 06:23:54 -0400
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1746976 for usery@mail.example.com; Mon, 02 Apr 2001 06:23:54 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id GAA19223
-	for <barry@digicool.com>; Mon, 2 Apr 2001 06:24:01 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id GAA19223
+	for <usery@example.com>; Mon, 2 Apr 2001 06:24:01 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14k1VB-0006KC-00
-	for barry@digicool.com; Mon, 02 Apr 2001 06:24:01 -0400
+	for usery@example.com; Mon, 02 Apr 2001 06:24:01 -0400
 Received: from [207.51.255.218] (helo=208.24.118.205)
 	by mail.python.org with smtp (Exim 3.21 #1)
 	id 14k1UG-0006Ia-00
@@ -46,52 +46,10 @@ X-BeenThere: mailman-users@python.org
 X-Mailman-Version: 2.0.3 (101270)
 Reply-To: <postmaster@208.24.118.205>
 
-Delivery failed 20 attempts: oliver@pcworld.com.ph
+Delivery failed 20 attempts: userx@example.ph
 
 
 Original message follows.
 
-Received: from SMTP32-FWD by the-pentagon.com
-  (SMTP32) id A00000199; Sun,  1 Apr 101 09:53:32 CST
-Received: from mail.python.org [63.102.49.29] by 208.24.118.205 with ESMTP
-  (SMTPD32-6.00) id AEF8223011C; Sun, 01 Apr 2001 10:53:31 -0500
-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 14jk6B-0005u4-00; Sun, 01 Apr 2001 11:49:03 -0400
-Received: from [195.3.3.14] (helo=ibis.worldnet.net)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 14jk5s-0005t5-00
-	for mailman-users@python.org; Sun, 01 Apr 2001 11:48:45 -0400
-Received: from m3.worldnet.net (m2.worldnet.net [195.3.3.6])
-	by ibis.worldnet.net (8.11.3/8.11.1) with ESMTP id f31Fmgv23795
-	for <mailman-users@python.org>; Sun, 1 Apr 2001 17:48:42 +0200 (CEST)
-	(envelope-from bootc@worldnet.fr)
-Received: from [195.3.46.106] (i46-106.province.worldnet.fr [195.3.46.106])
-	by m3.worldnet.net (8.11.2/8.11.1) with ESMTP id f31FnIY00581
-	for <mailman-users@python.org>; Sun, 1 Apr 2001 17:49:18 +0200 (CEST)
-	(envelope-from bootc@worldnet.fr)
-User-Agent: Microsoft-Outlook-Express-Macintosh-Edition/5.02.2022
-Subject: Re: [Mailman-Users] List Info page showing wrong e-mail address
-From: Chris Boot <bootc@worldnet.fr>
-To: Mailman Users <mailman-users@python.org>
-Message-ID: <B6ED1A51.CD1E%bootc@worldnet.fr>
-In-Reply-To: <B6EC3825.CCB5%bootc@worldnet.fr>
-Mime-version: 1.0
-Content-type: text/plain; charset="US-ASCII"
-Content-transfer-encoding: 7bit
-Sender: mailman-users-admin@python.org
-Errors-To: mailman-users-admin@python.org
-X-BeenThere: mailman-users@python.org
-X-Mailman-Version: 2.0.3 (101270)
-Precedence: bulk
-List-Help: <mailto:mailman-users-request@python.org?subject=help>
-List-Post: <mailto:mailman-users@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=subscribe>
-List-Id: Mailman mailing list management users <mailman-users.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=unsubscribe>
-
-[message truncated]
-
+Message removed