/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-11-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
class TestWalkdirs(TestCaseWithTree):
28
28
 
29
29
    def get_all_subdirs_expected(self, tree, symlinks):
30
 
        empty_dirs_present = (tree.has_versioned_directories() or
31
 
                              isinstance(tree, MutableTree))
 
30
        empty_dirs_present = (tree.has_versioned_directories()
 
31
                              or isinstance(tree, MutableTree))
32
32
        empty_dirs_are_versioned = tree.has_versioned_directories()
33
33
        dirblocks = {}
34
34
 
42
42
 
43
43
        dirblocks['1top-dir'] = [
44
44
            ('1top-dir/0file-in-1topdir', '0file-in-1topdir',
45
 
               'file', None, tree.path2id('1top-dir/0file-in-1topdir'), 'file')]
 
45
             'file', None, tree.path2id('1top-dir/0file-in-1topdir'), 'file')]
46
46
        if empty_dirs_present:
47
47
            dirblocks['1top-dir'].append(
48
 
            ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir', 'directory',
49
 
                None if empty_dirs_are_versioned else os.stat(tree.abspath('1top-dir/1dir-in-1topdir')),
50
 
               tree.path2id('1top-dir/1dir-in-1topdir'),
51
 
               'directory' if empty_dirs_are_versioned else None))
 
48
                ('1top-dir/1dir-in-1topdir', '1dir-in-1topdir', 'directory',
 
49
                 None if empty_dirs_are_versioned else os.stat(
 
50
                     tree.abspath('1top-dir/1dir-in-1topdir')),
 
51
                 tree.path2id('1top-dir/1dir-in-1topdir'),
 
52
                 'directory' if empty_dirs_are_versioned else None))
52
53
            dirblocks['1top-dir/1dir-in-1topdir'] = []
53
54
        if symlinks:
54
55
            dirblocks[''].append(
81
82
 
82
83
    def test_walkdir_subtree(self):
83
84
        tree = self.get_tree_with_subdirs_and_all_supported_content_types(
84
 
                has_symlinks())
 
85
            has_symlinks())
85
86
        # test that its iterable by iterating
86
87
        result = []
87
88
        tree.lock_read()
88
89
        expected_dirblocks = self.get_all_subdirs_expected(
89
 
                tree, has_symlinks())[1:]
 
90
            tree, has_symlinks())[1:]
90
91
        for dirinfo, block in tree.walkdirs('1top-dir'):
91
92
            newblock = []
92
93
            for row in block: