/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 breezy/tests/per_tree/test_walkdirs.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_walkdirs.py
38
38
             [('1top-dir/0file-in-1topdir', '0file-in-1topdir',
39
39
               'file', None, tree.path2id('1top-dir/0file-in-1topdir'), 'file'),
40
40
              ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir',
41
 
               'directory', None, tree.path2id('1top-dir/1dir-in-1topdir'), 'directory'),
42
 
              ]),
 
41
               'directory',
 
42
               None if tree.has_versioned_directories() else os.stat(tree.abspath('1top-dir/1dir-in-1topdir')),
 
43
               tree.path2id('1top-dir/1dir-in-1topdir'),
 
44
               'directory' if tree.has_versioned_directories() else None,
 
45
              )]),
43
46
            (('1top-dir/1dir-in-1topdir', tree.path2id('1top-dir/1dir-in-1topdir')),
44
47
             []),
45
48
            ]
46
49
        if symlinks:
47
50
            dirblocks[0][1].append(('symlink', 'symlink', 'symlink', None,
48
 
                                    'symlink', 'symlink'))
 
51
                                    tree.path2id('symlink'), 'symlink'))
49
52
        return dirblocks
50
53
 
51
54
    def test_walkdir_root(self):
105
108
        if tree.path2id('file') is None:
106
109
            raise tests.TestNotApplicable(
107
110
                'Tree type cannot represent dangling ids.')
108
 
        expected = [(('', work_tree.path2id('')), [
109
 
            ('dir', 'dir', 'unknown', None, dir_id, 'directory'),
110
 
            ('file', 'file', 'unknown', None, file_id, 'file')]),
111
 
            (('dir', dir_id), [])]
 
111
        expected = [(('', work_tree.path2id('')), ([
 
112
            ('dir', 'dir', 'unknown', None, dir_id, 'directory')]
 
113
            if tree.has_versioned_directories() else []) +
 
114
            [('file', 'file', 'unknown', None, file_id, 'file')])]
 
115
        if tree.has_versioned_directories():
 
116
            expected.append((('dir', dir_id), []))
112
117
        self.assertEqual(expected, list(tree.walkdirs()))