← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/adapters/tests/test_branch.py

  • Committer: William Grant
  • Date: 2010-03-12 06:19:52 UTC
  • mfrom: (10494 launchpad)
  • mto: (7675.583.7)
  • mto: This revision was merged to the branch mainline in revision 10501.
  • Revision ID: me@williamgrant.id.au-20100312061952-azff3x03cw3m73we
Merge devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/adapters/tests/test_branch.py
48
48
            registrant=registrant)
49
49
        old_merge_proposal = BranchMergeProposalDelta.snapshot(merge_proposal)
50
50
        merge_proposal.commit_message = 'Change foo into bar.'
 
51
        merge_proposal.description = 'Set the description.'
51
52
        merge_proposal.markAsMerged()
52
53
        delta = BranchMergeProposalDelta.construct(
53
54
            old_merge_proposal, merge_proposal)
54
55
        assert delta is not None
55
56
        self.assertEqual('Change foo into bar.', delta.commit_message)
 
57
        self.assertEqual('Set the description.', delta.description)
56
58
        self.assertEqual(
57
59
            {'old': BranchMergeProposalStatus.WORK_IN_PROGRESS,
58
60
            'new': BranchMergeProposalStatus.MERGED},