summaryrefslogtreecommitdiff
path: root/src/mailman/app/tests/test_bounces.py
diff options
context:
space:
mode:
authorBarry Warsaw2012-03-06 11:57:17 -0500
committerBarry Warsaw2012-03-06 11:57:17 -0500
commit4ca5055eea7c521e620de8ceeff6fa538b7a0c0b (patch)
tree63f24624049b82974c9302f4663ae1d4d2cd1146 /src/mailman/app/tests/test_bounces.py
parente2526bfa5cb3338ac98f101f3020b54c002252dc (diff)
downloadmailman-4ca5055eea7c521e620de8ceeff6fa538b7a0c0b.tar.gz
mailman-4ca5055eea7c521e620de8ceeff6fa538b7a0c0b.tar.zst
mailman-4ca5055eea7c521e620de8ceeff6fa538b7a0c0b.zip
Diffstat (limited to 'src/mailman/app/tests/test_bounces.py')
-rw-r--r--src/mailman/app/tests/test_bounces.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mailman/app/tests/test_bounces.py b/src/mailman/app/tests/test_bounces.py
index 3c4c80faf..be2c5cb78 100644
--- a/src/mailman/app/tests/test_bounces.py
+++ b/src/mailman/app/tests/test_bounces.py
@@ -308,6 +308,9 @@ $address
$optionsurl
$owneraddr
""", file=fp)
+ # Python 2.7 has assertMultiLineEqual. Let this work without bounds.
+ self.maxDiff = None
+ self.eq = getattr(self, 'assertMultiLineEqual', self.assertEqual)
def tearDown(self):
config.pop('xx template dir')
@@ -328,12 +331,7 @@ $owneraddr
send_probe(self._member, self._msg)
message = get_queue_messages('virgin')[0].msg
notice = message.get_payload(0).get_payload()
- try:
- # Python 2.7
- eq = self.assertMultiLineEqual
- except AttributeError:
- eq = self.assertEqual
- eq(notice, """\
+ self.eq(notice, """\
blah blah blah test@example.com anne@example.com
http://example.com/anne@example.com test-owner@example.com""")