/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_graph.py

  • Committer: Robert Collins
  • Date: 2007-07-25 00:52:21 UTC
  • mfrom: (2650 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2651.
  • Revision ID: robertc@robertcollins.net-20070725005221-0ysm6il5mqnme3wz
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_graph.py
181
181
        self.assertEqual(set(['rev1']), graph.find_lca('rev1', 'rev1'))
182
182
        self.assertEqual(set(['rev1']), graph.find_lca('rev2a', 'rev2b'))
183
183
 
 
184
    def test_no_unique_lca(self):
 
185
        """Test error when one revision is not in the graph"""
 
186
        graph = self.make_graph(ancestry_1)
 
187
        self.assertRaises(errors.NoCommonAncestor, graph.find_unique_lca,
 
188
                          'rev1', '1rev')
 
189
 
184
190
    def test_lca_criss_cross(self):
185
191
        """Test least-common-ancestor after a criss-cross merge."""
186
192
        graph = self.make_graph(criss_cross)