← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/mail/tests/test_branchmergeproposal.py

  • Committer: Michael Nelson
  • Date: 2010-06-04 07:20:19 UTC
  • mfrom: (10940 launchpad)
  • mto: This revision was merged to the branch mainline in revision 10942.
  • Revision ID: michael.nelson@canonical.com-20100604072019-qxxsmjfd5b72nxoh
Merge fresh devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/mail/tests/test_branchmergeproposal.py
67
67
            email='baz.quxx@example.com')
68
68
        bmp.source_branch.subscribe(subscriber,
69
69
            BranchSubscriptionNotificationLevel.NOEMAIL, None,
70
 
            CodeReviewNotificationLevel.FULL)
 
70
            CodeReviewNotificationLevel.FULL, subscriber)
71
71
        bmp.source_branch.owner.name = 'bob'
72
72
        bmp.source_branch.name = 'fix-foo-for-bar'
73
73
        bmp.target_branch.owner.name = 'mary'
176
176
        bmp = request.merge_proposal
177
177
        bmp.source_branch.subscribe(
178
178
            bmp.registrant, BranchSubscriptionNotificationLevel.NOEMAIL, None,
179
 
            CodeReviewNotificationLevel.FULL)
 
179
            CodeReviewNotificationLevel.FULL, bmp.registrant)
180
180
        mailer = BMPMailer.forCreation(bmp, bmp.registrant)
181
181
        ctrl = mailer.generateEmail(bmp.registrant,
182
182
                                    bmp.registrant.preferredemail.email)
259
259
            diff_text=diff_text)
260
260
        bmp.source_branch.subscribe(subscriber,
261
261
            BranchSubscriptionNotificationLevel.NOEMAIL, None,
262
 
            CodeReviewNotificationLevel.STATUS)
 
262
            CodeReviewNotificationLevel.STATUS, subscriber)
263
263
        mailer = BMPMailer.forCreation(bmp, bmp.registrant)
264
264
        ctrl = mailer.generateEmail('baz.quxx@example.com', subscriber)
265
265
        self.assertEqual(0, len(ctrl.attachments))