← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert J. Tanner
  • Date: 2009-04-30 22:40:42 UTC
  • mfrom: (4323 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4324.
  • Revision ID: tanner@real-time.com-20090430224042-53v45axtue5bw45l
Merge 1.14.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_walkdirs.py
26
26
class TestWalkdirs(TestCaseWithTree):
27
27
 
28
28
    def get_all_subdirs_expected(self, tree, symlinks):
 
29
        dirblocks = [
 
30
            (('', tree.path2id('')),
 
31
             [('0file', '0file', 'file', None, '2file', 'file'),
 
32
              ('1top-dir', '1top-dir', 'directory', None,
 
33
               '1top-dir', 'directory'),
 
34
              (u'2utf\u1234file', u'2utf\u1234file', 'file', None,
 
35
               u'0utf\u1234file'.encode('utf8'), 'file'),
 
36
              ]),
 
37
            (('1top-dir', '1top-dir'),
 
38
             [('1top-dir/0file-in-1topdir', '0file-in-1topdir',
 
39
               'file', None, '1file-in-1topdir', 'file'),
 
40
              ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir',
 
41
               'directory', None, '0dir-in-1topdir', 'directory'),
 
42
              ]),
 
43
            (('1top-dir/1dir-in-1topdir', '0dir-in-1topdir'),
 
44
             []),
 
45
            ]
29
46
        if symlinks:
30
 
            return [
31
 
                (('', tree.path2id('')),
32
 
                [
33
 
                 ('0file', '0file', 'file', None, '2file', 'file'),
34
 
                 ('1top-dir', '1top-dir', 'directory', None, '1top-dir', 'directory'),
35
 
                 (u'2utf\u1234file', u'2utf\u1234file', 'file', None,
36
 
                                         u'0utf\u1234file'.encode('utf8'), 'file'),
37
 
                 ('symlink', 'symlink', 'symlink', None, 'symlink', 'symlink')
38
 
                ]),
39
 
                (('1top-dir', '1top-dir'),
40
 
                [('1top-dir/0file-in-1topdir', '0file-in-1topdir', 'file', None, '1file-in-1topdir', 'file'),
41
 
                 ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir', 'directory', None, '0dir-in-1topdir', 'directory'),
42
 
                ]),
43
 
                (('1top-dir/1dir-in-1topdir', '0dir-in-1topdir'),
44
 
                [
45
 
                ]),
46
 
                ]
47
 
        else:
48
 
            return [
49
 
                (('', tree.path2id('')),
50
 
                [
51
 
                 ('0file', '0file', 'file', None, '2file', 'file'),
52
 
                 ('1top-dir', '1top-dir', 'directory', None, '1top-dir', 'directory'),
53
 
                 (u'2utf\u1234file', u'2utf\u1234file', 'file', None,
54
 
                                         u'0utf\u1234file'.encode('utf8'), 'file'),
55
 
                ]),
56
 
                (('1top-dir', '1top-dir'),
57
 
                [('1top-dir/0file-in-1topdir', '0file-in-1topdir', 'file', None, '1file-in-1topdir', 'file'),
58
 
                 ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir', 'directory', None, '0dir-in-1topdir', 'directory'),
59
 
                ]),
60
 
                (('1top-dir/1dir-in-1topdir', '0dir-in-1topdir'),
61
 
                [
62
 
                ]),
63
 
                ]
 
47
            dirblocks[0][1].append(('symlink', 'symlink', 'symlink', None,
 
48
                                    'symlink', 'symlink'))
 
49
        return dirblocks
64
50
 
65
51
    def test_walkdir_root(self):
66
 
        tree = self.get_tree_with_subdirs_and_all_supported_content_types(has_symlinks())
 
52
        tree = self.get_tree_with_subdirs_and_all_supported_content_types(
 
53
            has_symlinks())
67
54
        tree.lock_read()
68
55
        expected_dirblocks = self.get_all_subdirs_expected(tree, has_symlinks())
69
56
        # test that its iterable by iterating