/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Dirstate: all tree_implementation tests passing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_walkdirs.py
23
23
 
24
24
    def get_all_subdirs_expected(self, tree):
25
25
        return [
26
 
            (('', tree.inventory.root.file_id),
 
26
            (('', tree.path2id('')),
27
27
            [
28
28
             ('0file', '0file', 'file', None, '2file', 'file'),
29
29
             ('1top-dir', '1top-dir', 'directory', None, '1top-dir', 'directory'),
42
42
    def test_walkdir_root(self):
43
43
        tree = self.get_tree_with_subdirs_and_all_content_types()
44
44
        expected_dirblocks = self.get_all_subdirs_expected(tree)
 
45
        tree.lock_read()
45
46
        # test that its iterable by iterating
46
47
        result = []
47
48
        for dirinfo, block in tree.walkdirs():
52
53
                else:
53
54
                    newblock.append(row)
54
55
            result.append((dirinfo, newblock))
 
56
        tree.unlock()
55
57
        # check each return value for debugging ease.
56
58
        for pos, item in enumerate(expected_dirblocks):
57
59
            self.assertEqual(item, result[pos])
62
64
        expected_dirblocks = self.get_all_subdirs_expected(tree)[1:]
63
65
        # test that its iterable by iterating
64
66
        result = []
 
67
        tree.lock_read()
65
68
        for dirinfo, block in tree.walkdirs('1top-dir'):
66
69
            newblock = []
67
70
            for row in block:
70
73
                else:
71
74
                    newblock.append(row)
72
75
            result.append((dirinfo, newblock))
 
76
        tree.unlock()
73
77
        # check each return value for debugging ease.
74
78
        for pos, item in enumerate(expected_dirblocks):
75
79
            self.assertEqual(item, result[pos])