← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: Stuart Bishop
  • Date: 2011-09-28 12:49:24 UTC
  • mfrom: (9893.10.1 trivial)
  • mto: This revision was merged to the branch mainline in revision 14178.
  • Revision ID: stuart.bishop@canonical.com-20110928124924-m5a22fymqghw6c5i
Merged trivial into distinct-db-users.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/tests/test_branchcollection.py
749
749
        # way, for_branches=None (the default) has a very different behavior
750
750
        # than for_branches=[]: the first is no restriction, while the second
751
751
        # excludes everything.
752
 
        mp = self.factory.makeBranchMergeProposal()
 
752
        self.factory.makeBranchMergeProposal()
753
753
        proposals = self.all_branches.getMergeProposals(for_branches=[])
754
754
        self.assertEqual([], list(proposals))
755
755
        self.assertIsInstance(proposals, EmptyResultSet)
760
760
        # way, merged_revnos=None (the default) has a very different behavior
761
761
        # than merged_revnos=[]: the first is no restriction, while the second
762
762
        # excludes everything.
763
 
        mp = self.factory.makeBranchMergeProposal()
 
763
        self.factory.makeBranchMergeProposal()
764
764
        proposals = self.all_branches.getMergeProposals(merged_revnos=[])
765
765
        self.assertEqual([], list(proposals))
766
766
        self.assertIsInstance(proposals, EmptyResultSet)