← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/services/mail/tests/test_incoming.py

Merged rocketfuel into trivial.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/services/mail/tests/test_incoming.py
101
101
        # let's just treat everything as invalid, and trust that the regular
102
102
        # implementation of extraction and checking of timestamps is correct,
103
103
        # or at least tested.
 
104
 
104
105
        def fail_all_timestamps(timestamp, context):
105
106
            raise helpers.IncomingEmailError("fail!")
106
107
        self.assertRaises(
131
132
        original_to = 'eric@vikings.example.com'
132
133
        mail[ORIGINAL_TO_HEADER] = original_to
133
134
        self.assertThat(
134
 
            extract_addresses(mail, None, None, None),
 
135
            extract_addresses(mail, None, None),
135
136
            Equals([original_to]))
136
137
 
137
138
    def test_original_to_in_body(self):
143
144
        log = BufferLogger()
144
145
        mail = self.factory.makeSignedMessage(
145
146
            body=body, to_address=header_to)
146
 
        addresses = extract_addresses(mail, mail.as_string(), alias, log)
 
147
        addresses = extract_addresses(mail, alias, log)
147
148
        self.assertThat(addresses, Equals([header_to]))
148
149
        self.assertThat(
149
150
            log.getLogBuffer(),
154
155
        alias = 'librarian-somewhere'
155
156
        log = BufferLogger()
156
157
        mail = self.factory.makeSignedMessage(to_address=header_to)
157
 
        addresses = extract_addresses(mail, mail.as_string(), alias, log)
 
158
        addresses = extract_addresses(mail, alias, log)
158
159
        self.assertThat(addresses, Equals([header_to]))
159
160
        self.assertThat(
160
161
            log.getLogBuffer(),