Added new test bounces to test_bounces.py. Modified logic for "Stop" return.

Deleted 3 wrongly named test bounce files and added with correct names.

3 files changed, 151 insertions, 0 deletions

diff --git a/tests/bounces/smtp32_04.txt b/tests/bounces/smtp32_04.txt
new file mode 100644
index 00000000..813d956a
--- /dev/null
+++ b/tests/bounces/smtp32_04.txt
@@ -0,0 +1,47 @@
+Date:     Tue, 24 Jan 2006 22:17:41 -0700
+Message-Id: <10601242217.AA12075059@mail.value.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+From:     "Postmaster" <postmaster@mail.value.net>
+Sender:   <postmaster@mail.value.net>
+To:       <msapiro@value.net>
+Subject:  Undeliverable Mail
+X-Mailer: <SMTP32 v8.15>
+X-RCPT-TO: <msapiro@value.net>
+Status: U
+X-UIDL: 430587558
+
+Unknown user: after_another@pacbell.net
+
+RCPT TO generated following response:
+553 5.3.0 <after_another@pacbell.net>... Addressee unknown, relay=[205.208.202.10]
+
+Unknown user: one_bad_address@pacbell.net
+
+RCPT TO generated following response:
+553 5.3.0 <one_bad_address@pacbell.net>... Addressee unknown, relay=[205.208.202.10]
+
+
+
+Original message follows.
+
+Received: from msapiro [209.182.169.133] by mail.value.net with ESMTP
+  (SMTPD32-8.15) id A9F448A600B8; Tue, 24 Jan 2006 22:17:40 -0700
+Message-ID: <PC174020060124211738020333d20271@msapiro>
+X-Mailer: Ultrafunk Popcorn 1.74 (11-May-2005)
+X-Priority: 3
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=iso-8859-1
+Date: Tue, 24 Jan 2006 21:17:38 -0800
+From: Mark Sapiro <msapiro@value.net>
+To: one_bad_address@pacbell.net,
+	after_another@pacbell.net
+Subject: test
+Organization: Not Very Much
+
+
+-- 
+Mark Sapiro <msapiro@value.net>       The highway is for gamblers,
+San Francisco Bay Area, California    better use your sense - B. Dylan
+
diff --git a/tests/bounces/smtp32_05.txt b/tests/bounces/smtp32_05.txt
new file mode 100644
index 00000000..92997ace
--- /dev/null
+++ b/tests/bounces/smtp32_05.txt
@@ -0,0 +1,63 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from jmrpowersports.com ([63.223.75.179])
+	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k15JIAOT013762
+	for <gpc-talk-bounces@grizz.org>; Sun, 5 Feb 2006 11:18:10 -0800
+Date: Sun,  5 Feb 2006 11:49:29 -0800
+Message-Id: <10602051149.AA116930381@jmrpowersports.com>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+From: "Postmaster" <postmaster@jmrpowersports.com>
+Sender: <postmaster@jmrpowersports.com>
+To: <gpc-talk-bounces@grizz.org>
+Subject: Undeliverable Mail
+X-Mailer: <SMTP32 v8.05>
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Found to be clean
+X-Songbird-From: 
+
+undeliverable  to jmrpowersports@jmrpowersports.com
+
+
+Original message follows.
+
+Received: from sb7.songbird.com [208.184.79.137] by jmrpowersports.com with ESMTP
+  (SMTPD32-8.05) id A6C88FC02BA; Sun, 05 Feb 2006 11:49:28 -0800
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k15JHHfQ013340
+	for <fox@jmrpowersports.com>; Sun, 5 Feb 2006 11:17:17 -0800
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Subject: Your message to GPC-talk awaits moderator approval
+From: gpc-talk-bounces@grizz.org
+To: fox@jmrpowersports.com
+Message-ID: <mailman.6113.1139167036.1568.gpc-talk@grizz.org>
+Date: Sun, 05 Feb 2006 11:17:16 -0800
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Found to be clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+Your mail to 'GPC-talk' with the subject
+
+    Pre-approved Application #ZKQNJDJ328846
+
+Is being held until the list moderator can review it for approval.
+
+The reason it is being held:
+
+    Post by non-member to a members-only list
+
+Either the message will get posted to the list, or you will receive
+notification of the moderator's decision.  If you would like to cancel
+this posting, please visit the following URL:
+
+    http://www.grizz.org/mailman/confirm/gpc-talk/4f1e0e8d37f7013e71ed860bd26ba7e39ba6df91
+
+
diff --git a/tests/bounces/smtp32_06.txt b/tests/bounces/smtp32_06.txt
new file mode 100644
index 00000000..ec7cc952
--- /dev/null
+++ b/tests/bounces/smtp32_06.txt
@@ -0,0 +1,41 @@
+Date:     Fri, 18 Nov 2005 21:22:05 -0700
+Message-Id: <10511182122.AA10923782@mail.value.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+From:     "Postmaster" <postmaster@mail.value.net>
+Sender:   <postmaster@mail.value.net>
+To:       <msapiro@value.net>
+Subject:  Undeliverable Mail
+X-Mailer: <SMTP32 v8.15>
+X-RCPT-TO: <msapiro@value.net>
+Status: U
+X-UIDL: 430582473
+
+Unknown user: Absolute_garbage_addr@pacbell.net
+
+RCPT TO generated following response:
+553 5.3.0 <Absolute_garbage_addr@pacbell.net>... Addressee unknown, relay=[205.208.202.10]
+
+
+
+Original message follows.
+
+Received: from msapiro [209.182.169.133] by mail.value.net with ESMTP
+  (SMTPD32-8.15) id A86C394C00A6; Fri, 18 Nov 2005 21:22:04 -0700
+Message-ID: <PC1740200511182022000562294774d2@msapiro>
+X-Mailer: Ultrafunk Popcorn 1.74 (11-May-2005)
+X-Priority: 3
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=iso-8859-1
+Date: Fri, 18 Nov 2005 20:22:00 -0800
+From: Mark Sapiro <msapiro@value.net>
+To: Absolute_garbage_addr@pacbell.net
+Subject: Bounce test
+Organization: Not Very Much
+
+
+-- 
+Mark Sapiro <msapiro@value.net>       The highway is for gamblers,
+San Francisco Bay Area, California    better use your sense - B. Dylan
+