Rev 2483: Make all test_add_reference tests pass again. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2483
revision-id: robertc at robertcollins.net-20070306130853-1k6knym5pxf1jcns
parent: robertc at robertcollins.net-20070306125822-gs9rgs7v2erqgf2d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 00:08:53 +1100
message:
  Make all test_add_reference tests pass again.
modified:
  bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
=== modified file 'bzrlib/tests/workingtree_implementations/test_add_reference.py'
--- a/bzrlib/tests/workingtree_implementations/test_add_reference.py	2007-03-06 11:04:03 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_add_reference.py	2007-03-06 13:08:53 +0000
@@ -57,11 +57,9 @@
             basis = tree.basis_tree()
             basis.lock_read()
             try:
-                entry = basis.inventory['sub-tree-root-id']
-                self.assertEqual(entry.kind, 'tree-reference')
-                sub_tree = tree.get_nested_tree(entry)
+                sub_tree = tree.get_nested_tree('sub-tree-root-id')
                 self.assertEqual(sub_tree.last_revision(),
-                                 entry.reference_revision)
+                    tree.get_reference_revision('sub-tree-root-id'))
             finally:
                 basis.unlock()
         finally:
@@ -107,10 +105,8 @@
         tree, sub_tree = self.make_nested_trees()
         tree.lock_read()
         try:
-            sub_tree2 = tree.get_nested_tree(
-                tree.inventory['sub-tree-root-id'])
+            sub_tree2 = tree.get_nested_tree('sub-tree-root-id')
             self.assertEqual(sub_tree.basedir, sub_tree2.basedir)
-            sub_tree2 = tree.get_nested_tree(
-                tree.inventory['sub-tree-root-id'], 'sub-tree')
+            sub_tree2 = tree.get_nested_tree('sub-tree-root-id', 'sub-tree')
         finally:
             tree.unlock()