← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_nested_specifics.py

Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_nested_specifics.py
44
44
        tree.lock_read()
45
45
        self.addCleanup(tree.unlock)
46
46
        self.assertEqual('subtree-revision',
47
 
            tree.inventory['subtree-id'].reference_revision)
 
47
            tree.root_inventory['subtree-id'].reference_revision)
48
48
 
49
49
    def test_extract_while_locked(self):
50
50
        tree = self.make_branch_and_tree('.')
75
75
 
76
76
    def test_inventory_does_not_autodetect_subtree(self):
77
77
        tree = self.prepare_with_subtree()
78
 
        ie = tree.inventory['subtree-id']
79
 
        self.assertEqual('directory', ie.kind)
 
78
        self.assertEqual('directory', tree.kind('subtree-id'))
80
79
 
81
80
    def test_iter_entries_by_dir_autodetects_subtree(self):
82
81
        tree = self.prepare_with_subtree()