← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_tree.py

Merge with preview-changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
69
69
 
70
70
    def skip_if_no_reference(self, tree):
71
71
        if not getattr(tree, 'supports_tree_reference', lambda: False)():
72
 
            raise tests.TestSkipped('Tree references not supported')
 
72
            raise tests.TestNotApplicable('Tree references not supported')
73
73
 
74
74
    def create_nested(self):
75
75
        work_tree = self.make_branch_and_tree('wt')
88
88
 
89
89
    def test_get_reference_revision(self):
90
90
        tree = self.create_nested()
 
91
        tree.lock_read()
 
92
        self.addCleanup(tree.unlock)
91
93
        path = tree.id2path('sub-root')
92
94
        self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path))
93
95
 
96
98
        tree.lock_read()
97
99
        self.addCleanup(tree.unlock)
98
100
        entry = tree.inventory['sub-root']
99
 
        self.assertEqual([(tree.abspath('subtree'), 'sub-root')],
 
101
        self.assertEqual([(u'subtree', 'sub-root')],
100
102
            list(tree.iter_references()))
101
103
 
102
104
    def test_get_root_id(self):