← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
127
127
    self.addCleanup(tree.unlock)
128
128
    if not invalid_delta:
129
129
        tree._validate()
130
 
    return tree.inventory
 
130
    return tree.root_inventory
131
131
 
132
132
 
133
133
def _create_repo_revisions(repo, basis, delta, invalid_delta):
224
224
    basis_tree = tree.basis_tree()
225
225
    basis_tree.lock_read()
226
226
    test.addCleanup(basis_tree.unlock)
227
 
    basis_inv = basis_tree.inventory
 
227
    basis_inv = basis_tree.root_inventory
228
228
    if target_entries:
229
229
        basis_entries = list(basis_inv.iter_entries_by_dir())
230
230
        test.assertEqual(target_entries, basis_entries)
1567
1567
        self.assertEquals("a", inv['thefileid'].name)
1568
1568
        # The inventory should be mutable and independent of
1569
1569
        # the original tree
1570
 
        self.assertFalse(tree.inventory['thefileid'].executable)
 
1570
        self.assertFalse(tree.root_inventory['thefileid'].executable)
1571
1571
        inv['thefileid'].executable = True
1572
 
        self.assertFalse(tree.inventory['thefileid'].executable)
 
1572
        self.assertFalse(tree.root_inventory['thefileid'].executable)