Update of /cvsroot/mailman/mailman/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv32471
Modified Files:
Tag: Release_2_1-maint
test_handlers.py
Log Message:
Update a bunch of tests.
Index: test_handlers.py
===================================================================
RCS file: /cvsroot/mailman/mailman/tests/test_handlers.py,v
retrieving revision 2.9.2.1
retrieving revision 2.9.2.2
diff -u -d -r2.9.2.1 -r2.9.2.2
--- test_handlers.py 31 Mar 2003 22:04:41 -0000 2.9.2.1
+++ test_handlers.py 31 Mar 2003 23:12:24 -0000 2.9.2.2
@@ -708,7 +708,7 @@
""", Message.Message)
CookHeaders.process(self._mlist, msg, {})
- eq(msg['list-id'], 'A Test List <_xtest.dom.ain>')
+ eq(msg['list-id'].__unicode__(), 'A Test List <_xtest.dom.ain>')
eq(msg['list-help'], '<mailto:[EMAIL PROTECTED]>')
eq(msg['list-unsubscribe'],
'<http://www.dom.ain/mailman/listinfo/_xtest>,'
@@ -807,8 +807,9 @@
%(spooge)s footer""")
def test_multipart(self):
+ eq = self.ndiffAssertEqual
mlist = self._mlist
- mlist.msg_header = 'header\n'
+ mlist.msg_header = 'header'
mlist.msg_footer = 'footer'
msg1 = email.message_from_string("""\
From: [EMAIL PROTECTED]
@@ -826,7 +827,7 @@
msg.attach(msg1)
msg.attach(msg2)
Decorate.process(self._mlist, msg, {})
- self.assertEqual(msg.as_string(unixfrom=0), """\
+ eq(msg.as_string(unixfrom=0), """\
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="BOUNDARY"
@@ -837,7 +838,6 @@
Content-Disposition: inline
header
-
--BOUNDARY
From: [EMAIL PROTECTED]
@@ -855,7 +855,6 @@
Content-Disposition: inline
footer
-
--BOUNDARY--""")
def test_image(self):
@@ -1611,11 +1610,12 @@
eq(len(files), 1)
msg2, data = self._sb.dequeue(files[0])
eq(msg.as_string(unixfrom=0), msg2.as_string(unixfrom=0))
- eq(len(data), 5)
+ eq(len(data), 6)
eq(data['foo'], 1)
eq(data['bar'], 2)
eq(data['version'], 3)
eq(data['listname'], '_xtest')
+ eq(data['verp'], 1)
# Clock skew makes this unreliable
#self.failUnless(data['received_time'] <= time.time())
@@ -1683,8 +1683,6 @@
suite.addTest(unittest.makeSuite(TestMimeDel))
suite.addTest(unittest.makeSuite(TestModerate))
suite.addTest(unittest.makeSuite(TestReplybot))
- suite.addTest(unittest.makeSuite(TestSMTPDirect))
- suite.addTest(unittest.makeSuite(TestSendmail))
suite.addTest(unittest.makeSuite(TestSpamDetect))
suite.addTest(unittest.makeSuite(TestTagger))
suite.addTest(unittest.makeSuite(TestToArchive))
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
