------------------------------------------------------------
revno: 1628
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Sun 2016-02-28 22:20:11 -0800
message:
Fixed some tests that were broken by prior changes.
modified:
tests/test_handlers.py
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'tests/test_handlers.py'
--- tests/test_handlers.py 2015-01-04 02:24:24 +0000
+++ tests/test_handlers.py 2016-02-29 06:20:11 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2016 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
@@ -838,10 +838,10 @@
eq(msg['list-help'], '<mailto:_xtest-requ...@dom.ain?subject=help>')
eq(msg['list-unsubscribe'],
'<http://www.dom.ain/mailman/options/_xtest>,'
- '\n\t<mailto:_xtest-requ...@dom.ain?subject=unsubscribe>')
+ '\n <mailto:_xtest-requ...@dom.ain?subject=unsubscribe>')
eq(msg['list-subscribe'],
'<http://www.dom.ain/mailman/listinfo/_xtest>,'
- '\n\t<mailto:_xtest-requ...@dom.ain?subject=subscribe>')
+ '\n <mailto:_xtest-requ...@dom.ain?subject=subscribe>')
eq(msg['list-post'], '<mailto:_xt...@dom.ain>')
eq(msg['list-archive'], '<http://www.dom.ain/pipermail/_xtest/>')
@@ -858,10 +858,10 @@
eq(msg['list-help'], '<mailto:_xtest-requ...@dom.ain?subject=help>')
eq(msg['list-unsubscribe'],
'<http://www.dom.ain/mailman/options/_xtest>,'
- '\n\t<mailto:_xtest-requ...@dom.ain?subject=unsubscribe>')
+ '\n <mailto:_xtest-requ...@dom.ain?subject=unsubscribe>')
eq(msg['list-subscribe'],
'<http://www.dom.ain/mailman/listinfo/_xtest>,'
- '\n\t<mailto:_xtest-requ...@dom.ain?subject=subscribe>')
+ '\n <mailto:_xtest-requ...@dom.ain?subject=subscribe>')
eq(msg['list-post'], '<mailto:_xt...@dom.ain>')
@@ -1771,7 +1771,7 @@
class TestSpamDetect(TestBase):
def test_short_circuit(self):
msgdata = {'approved': 1}
- msg = email.message_from_string('')
+ msg = email.message_from_string('', Message.Message)
rtn = SpamDetect.process(self._mlist, msg, msgdata)
# Not really a great test, but there's little else to assert
self.assertEqual(rtn, None)
@@ -1781,12 +1781,12 @@
From: aper...@dom.ain
A message.
-""")
+""", Message.Message)
msg2 = email.message_from_string("""\
To: xl...@dom.ain
A message.
-""")
+""", Message.Message)
spammers = mm_cfg.KNOWN_SPAMMERS[:]
try:
mm_cfg.KNOWN_SPAMMERS.append(('from', '.?person'))
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
