aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2013-12-19 18:30:55 -0800
committerMark Sapiro <mark@msapiro.net>2013-12-19 18:30:55 -0800
commit729b5a01726ff13c68bb794e079d424771682538 (patch)
tree68b74a4274bf40f53505b482b05864dc24ac4518
parentd4b1c7afa712b5e4bc989fe69cffe2d252db642a (diff)
downloadmailman2-729b5a01726ff13c68bb794e079d424771682538.tar.gz
mailman2-729b5a01726ff13c68bb794e079d424771682538.tar.xz
mailman2-729b5a01726ff13c68bb794e079d424771682538.zip
Fixed a few failing tests in tests/test_handlers.py.
-rwxr-xr-xNEWS2
-rw-r--r--tests/test_handlers.py9
2 files changed, 8 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 00d83389..246606ef 100755
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Fixed a few failing tests in tests/test_handlers.py. (LP: #1262950)
+
- Fixed bin/arch to not create scrubbed attachments for messages skipped
when processing the --start= option. (LP: #1260883)
diff --git a/tests/test_handlers.py b/tests/test_handlers.py
index aa73b3c1..b9529779 100644
--- a/tests/test_handlers.py
+++ b/tests/test_handlers.py
@@ -704,7 +704,7 @@ From: aperson@dom.ain
'<http://www.dom.ain/mailman/listinfo/_xtest>,'
'\n\t<mailto:_xtest-request@dom.ain?subject=subscribe>')
eq(msg['list-post'], '<mailto:_xtest@dom.ain>')
- eq(msg['list-archive'], '<http://www.dom.ain/pipermail/_xtest>')
+ eq(msg['list-archive'], '<http://www.dom.ain/pipermail/_xtest/>')
def test_list_headers_with_description(self):
eq = self.assertEqual
@@ -1221,7 +1221,8 @@ MIME-Version: 1.0
""")
MimeDel.process(self._mlist, msg, {})
eq(msg.get_content_type(), 'text/plain')
- eq(msg.get_payload(), '\n\n\n')
+ #eq(msg.get_payload(), '\n\n\n')
+ eq(msg.get_payload().strip(), '')
def test_deep_structure(self):
eq = self.assertEqual
@@ -1878,7 +1879,9 @@ Here is message %(i)d
mlist = self._mlist
msg = self._makemsg(99)
size = os.path.getsize(self._path) + len(str(msg))
- mlist.digest_size_threshhold = 0
+ # Set digest_size_threshhold to a very small value to force a digest.
+ # Setting to zero no longer works.
+ mlist.digest_size_threshhold = 0.001
ToDigest.process(mlist, msg, {})
files = self._sb.files()
# There should be two files in the queue, one for the MIME digest and