~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
            [('', 'root-id'), ('a', 'a-id'), ('b', 'b-id'), ('b/c', 'c-id')],
52
52
            [(path, node.file_id) for path, node in tree.iter_entries_by_dir()])
53
53
        self.assertEqualDiff('contents of a\n', tree.get_file_text('a-id'))
54
 
        self.assertFalse(tree.is_executable('c-id'))
 
54
        self.assertFalse(tree.is_executable('c-id', path='b/c'))
55
55
 
56
56
    def test_abc_tree_content_2_no_parents(self):
57
57
        tree = self.make_branch_and_tree('.')