Update of /cvsroot/mailman/mailman/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13648
Modified Files:
Tag: Release_2_1-maint
test_bounces.py
Log Message:
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.
Index: test_bounces.py
===================================================================
RCS file: /cvsroot/mailman/mailman/tests/test_bounces.py,v
retrieving revision 2.16.2.1
retrieving revision 2.16.2.2
diff -u -d -r2.16.2.1 -r2.16.2.2
--- test_bounces.py 27 Aug 2005 01:40:17 -0000 2.16.2.1
+++ test_bounces.py 2 Mar 2006 05:06:17 -0000 2.16.2.2
@@ -1,4 +1,4 @@
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""Test the bounce detection modules."""
@@ -21,6 +22,8 @@
import unittest
import email
+from Mailman.Bouncers.BouncerAPI import Stop
+
class BounceTest(unittest.TestCase):
@@ -40,6 +43,10 @@
('SimpleMatch', 'simple_04.txt', ['[EMAIL PROTECTED]']),
('SimpleMatch', 'newmailru_01.txt', ['[EMAIL PROTECTED]']),
('SimpleMatch', 'hotpop_01.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'microsoft_03.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'simple_05.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'simple_06.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'simple_07.txt', ['[EMAIL PROTECTED]']),
# SimpleWarning
('SimpleWarning', 'simple_03.txt', ['[EMAIL PROTECTED]']),
# GroupWise
@@ -56,13 +63,14 @@
('DSN', 'dsn_02.txt', ['[EMAIL PROTECTED]']),
('DSN', 'dsn_03.txt', ['[EMAIL PROTECTED]']),
('DSN', 'dsn_04.txt', ['[EMAIL PROTECTED]']),
- ('DSN', 'dsn_05.txt', ['[EMAIL PROTECTED]']),
- ('DSN', 'dsn_06.txt', ['[EMAIL PROTECTED]']),
- ('DSN', 'dsn_07.txt', ['[EMAIL PROTECTED]']),
- ('DSN', 'dsn_08.txt', ['[EMAIL PROTECTED]']),
+ ('DSN', 'dsn_05.txt', Stop),
+ ('DSN', 'dsn_06.txt', Stop),
+ ('DSN', 'dsn_07.txt', Stop),
+ ('DSN', 'dsn_08.txt', Stop),
('DSN', 'dsn_09.txt', ['[EMAIL PROTECTED]']),
('DSN', 'dsn_10.txt', ['[EMAIL PROTECTED]']),
('DSN', 'dsn_11.txt', ['[EMAIL PROTECTED]']),
+ ('DSN', 'dsn_12.txt', ['[EMAIL PROTECTED]']),
# Microsoft Exchange
('Exchange', 'microsoft_01.txt', ['[EMAIL PROTECTED]']),
('Exchange', 'microsoft_02.txt', ['[EMAIL PROTECTED]']),
@@ -70,8 +78,13 @@
('SMTP32', 'smtp32_01.txt', ['[EMAIL PROTECTED]']),
('SMTP32', 'smtp32_02.txt', ['[EMAIL PROTECTED]']),
('SMTP32', 'smtp32_03.txt', ['[EMAIL PROTECTED]']),
+ ('SMTP32', 'smtp32_04.txt', ['[EMAIL PROTECTED]',
+ '[EMAIL PROTECTED]']),
+ ('SMTP32', 'smtp32_05.txt', ['[EMAIL PROTECTED]']),
+ ('SMTP32', 'smtp32_06.txt', ['[EMAIL PROTECTED]']),
# Qmail
('Qmail', 'qmail_01.txt', ['[EMAIL PROTECTED]']),
+ ('Qmail', 'qmail_02.txt', ['[EMAIL PROTECTED]']),
# LLNL's custom Sendmail
('LLNL', 'llnl_01.txt', ['[EMAIL PROTECTED]']),
# Netscape's server...
@@ -101,6 +114,9 @@
'[EMAIL PROTECTED]']),
('Yahoo', 'yahoo_09.txt', ['[EMAIL PROTECTED]',
'[EMAIL PROTECTED]']),
+ ('Yahoo', 'yahoo_10.txt', ['[EMAIL PROTECTED]',
+ '[EMAIL PROTECTED]',
+ '[EMAIL PROTECTED]']),
# sina.com appears to use their own weird SINAEMAIL MTA
('Sina', 'sina_01.txt', ['[EMAIL PROTECTED]', '[EMAIL PROTECTED]']),
# No address can be detected in these...
@@ -121,8 +137,10 @@
# Some modules return None instead of [] for failure
if foundaddrs is None:
foundaddrs = []
- addrs.sort()
- foundaddrs.sort()
+ if foundaddrs is not Stop:
+ foundaddrs = [found.strip() for found in foundaddrs]
+ addrs.sort()
+ foundaddrs.sort()
self.assertEqual(addrs, foundaddrs)
def test_SMTP32_failure(self):
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
