/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/workingtree_implementations/test_add_reference.py

  • Committer: Robert Collins
  • Date: 2007-03-06 13:08:53 UTC
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070306130853-1k6knym5pxf1jcns
Make all test_add_reference tests pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_add_reference.py
57
57
            basis = tree.basis_tree()
58
58
            basis.lock_read()
59
59
            try:
60
 
                entry = basis.inventory['sub-tree-root-id']
61
 
                self.assertEqual(entry.kind, 'tree-reference')
62
 
                sub_tree = tree.get_nested_tree(entry)
 
60
                sub_tree = tree.get_nested_tree('sub-tree-root-id')
63
61
                self.assertEqual(sub_tree.last_revision(),
64
 
                                 entry.reference_revision)
 
62
                    tree.get_reference_revision('sub-tree-root-id'))
65
63
            finally:
66
64
                basis.unlock()
67
65
        finally:
107
105
        tree, sub_tree = self.make_nested_trees()
108
106
        tree.lock_read()
109
107
        try:
110
 
            sub_tree2 = tree.get_nested_tree(
111
 
                tree.inventory['sub-tree-root-id'])
 
108
            sub_tree2 = tree.get_nested_tree('sub-tree-root-id')
112
109
            self.assertEqual(sub_tree.basedir, sub_tree2.basedir)
113
 
            sub_tree2 = tree.get_nested_tree(
114
 
                tree.inventory['sub-tree-root-id'], 'sub-tree')
 
110
            sub_tree2 = tree.get_nested_tree('sub-tree-root-id', 'sub-tree')
115
111
        finally:
116
112
            tree.unlock()