← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_executable.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/per_workingtree/test_executable.py
58
58
        tree.lock_read()
59
59
        if not ignore_inv:
60
60
            self.assertEqual(
61
 
                [('', tree.inventory.root)],
62
 
                list(tree.inventory.iter_entries()))
 
61
                [('', tree.root_inventory.root)],
 
62
                list(tree.root_inventory.iter_entries()))
63
63
        self.assertFalse(tree.has_id(self.a_id))
64
64
        self.assertFalse(tree.has_filename('a'))
65
65
        self.assertFalse(tree.has_id(self.b_id))
181
181
            self.wt._is_executable_from_path_and_stat_from_basis
182
182
        rev_id1 = self.wt.commit('one')
183
183
        rev_tree1 = self.wt.branch.repository.revision_tree(rev_id1)
184
 
        a_executable = rev_tree1.inventory[self.a_id].executable
185
 
        b_executable = rev_tree1.inventory[self.b_id].executable
 
184
        a_executable = rev_tree1.root_inventory[self.a_id].executable
 
185
        b_executable = rev_tree1.root_inventory[self.b_id].executable
186
186
        self.assertIsNot(None, a_executable)
187
187
        self.assertTrue(a_executable)
188
188
        self.assertIsNot(None, b_executable)