← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: Tim Penhey
  • Date: 2010-10-18 03:39:28 UTC
  • mto: This revision was merged to the branch mainline in revision 11759.
  • Revision ID: tim.penhey@canonical.com-20101018033928-oe0gj03xow6epuet
Add an extra event for the needs review, but keep the same functionality for now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/tests/test_branchmergeproposal.py
50
50
    WrongBranchMergeProposal,
51
51
    )
52
52
from lp.code.event.branchmergeproposal import (
 
53
    BranchMergeProposalNeedsReviewEvent,
53
54
    NewBranchMergeProposalEvent,
54
55
    NewCodeReviewCommentEvent,
55
56
    ReviewerNominatedEvent,
645
646
        merge_proposal = self.factory.makeBranchMergeProposal()
646
647
        commenter = self.factory.makePerson()
647
648
        login_person(commenter)
648
 
        result, event = self.assertNotifies(
 
649
        result, events = self.assertNotifies(
649
650
            NewCodeReviewCommentEvent,
650
651
            merge_proposal.createComment,
651
652
            owner=commenter,
652
653
            subject='A review.')
653
 
        self.assertEqual(result, event.object)
 
654
        self.assertEqual(result, events[0].object)
654
655
 
655
656
    def test_notify_on_nominate_suppressed_if_requested(self):
656
657
        # Ensure that the notification is supressed if the notify listeners
758
759
        target_branch = self.factory.makeProductBranch(
759
760
            product=source_branch.product)
760
761
        registrant = self.factory.makePerson()
761
 
        result, event = self.assertNotifies(
762
 
            NewBranchMergeProposalEvent,
 
762
        result, events = self.assertNotifies(
 
763
            [NewBranchMergeProposalEvent,
 
764
             BranchMergeProposalNeedsReviewEvent],
763
765
            source_branch.addLandingTarget, registrant, target_branch)
764
 
        self.assertEqual(result, event.object)
 
766
        self.assertEqual(result, events[0].object)
765
767
 
766
768
    def test_getNotificationRecipients(self):
767
769
        """Ensure that recipients can be added/removed with subscribe"""
1333
1335
        merge_proposal = self.factory.makeBranchMergeProposal()
1334
1336
        login_person(merge_proposal.source_branch.owner)
1335
1337
        reviewer = self.factory.makePerson()
1336
 
        result, event = self.assertNotifies(
 
1338
        result, events = self.assertNotifies(
1337
1339
            ReviewerNominatedEvent,
1338
1340
            merge_proposal.nominateReviewer,
1339
1341
            reviewer=reviewer,
1340
1342
            registrant=merge_proposal.source_branch.owner)
1341
 
        self.assertEqual(result, event.object)
 
1343
        self.assertEqual(result, events[0].object)
1342
1344
 
1343
1345
    def test_notify_on_nominate_suppressed_if_requested(self):
1344
1346
        # Ensure that a notification is suppressed if notify listeners is set