← Back to branch summary

~barry/mailman/lp1423756

« back to all changes in this revision

Viewing changes to src/mailman/app/tests/test_inject.py

  • Committer: Barry Warsaw
  • Date: 2015-01-05 01:20:33 UTC
  • mfrom: (7264.4.66 py3)
  • Revision ID: barry@list.org-20150105012033-zdrw9c2odhpf22fz
Merge the Python 3 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mailman/app/tests/test_inject.py
17
17
 
18
18
"""Testing app.inject functions."""
19
19
 
20
 
from __future__ import absolute_import, print_function, unicode_literals
21
 
 
22
 
__metaclass__ = type
23
20
__all__ = [
 
21
    'TestInjectMessage',
 
22
    'TestInjectText',
24
23
    ]
25
24
 
26
25
 
64
63
        self.assertEqual(len(items), 1)
65
64
        self.assertMultiLineEqual(items[0].msg.as_string(),
66
65
                                  self.msg.as_string())
67
 
        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
 
66
        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
68
67
        self.assertEqual(items[0].msgdata['original_size'],
69
68
                         len(self.msg.as_string()))
70
69
 
84
83
        self.assertEqual(len(items), 1)
85
84
        self.assertMultiLineEqual(items[0].msg.as_string(),
86
85
                                  self.msg.as_string())
87
 
        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
 
86
        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
88
87
        self.assertEqual(items[0].msgdata['original_size'],
89
88
                         len(self.msg.as_string()))
90
89
 
144
143
 
145
144
    def setUp(self):
146
145
        self.mlist = create_list('test@example.com')
147
 
        self.text = b"""\
 
146
        self.text = """\
148
147
From: bart@example.com
149
148
To: test@example.com
150
149
Subject: A test message
171
170
        # Delete that header because it is not in the original text.
172
171
        del items[0].msg['x-message-id-hash']
173
172
        self.assertMultiLineEqual(items[0].msg.as_string(), self.text)
174
 
        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
 
173
        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
175
174
        self.assertEqual(items[0].msgdata['original_size'],
176
175
                         # Add back the X-Message-ID-Header which was in the
177
176
                         # message contributing to the original_size, but
196
195
        # Remove the X-Message-ID-Hash header which isn't in the original text.
197
196
        del items[0].msg['x-message-id-hash']
198
197
        self.assertMultiLineEqual(items[0].msg.as_string(), self.text)
199
 
        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
 
198
        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
200
199
        self.assertEqual(items[0].msgdata['original_size'],
201
200
                         # Add back the X-Message-ID-Header which was in the
202
201
                         # message contributing to the original_size, but