~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_graph.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-19 16:09:34 UTC
  • mfrom: (2520.4.135 bzr.mpbundle)
  • Revision ID: pqm@pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
Add new bundle and merge-directive formats

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)