Rev 3305: One last use of deprecated methods. in http://people.ubuntu.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 3305
revision-id: robertc at robertcollins.net-20080328045853-ieqn8amdd8a1eon4
parent: robertc at robertcollins.net-20080328035440-4cflvryqujresn2g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2008-03-28 15:58:53 +1100
message:
  One last use of deprecated methods.
modified:
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
=== modified file 'bzrlib/tests/branch_implementations/test_branch.py'
--- a/bzrlib/tests/branch_implementations/test_branch.py	2008-03-04 21:59:33 +0000
+++ b/bzrlib/tests/branch_implementations/test_branch.py	2008-03-28 04:58:53 +0000
@@ -57,8 +57,11 @@
 
     def test_create_tree_with_merge(self):
         tree = self.create_tree_with_merge()
-        ancestry_graph = tree.branch.repository.get_revision_graph('rev-3')
-        self.assertEqual({'rev-1':(),
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        graph = tree.branch.repository.get_graph()
+        ancestry_graph = graph.get_parent_map(tree.branch.repository.all_revision_ids())
+        self.assertEqual({'rev-1':('null:',),
                           'rev-2':('rev-1', ),
                           'rev-1.1.1':('rev-1', ),
                           'rev-3':('rev-2', 'rev-1.1.1', ),