/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_list_files.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_list_files.py
60
60
        expected = [('', 'V', 'directory', tree.path2id('')),
61
61
                    ('a', 'V', 'file', tree.path2id('a')),
62
62
                   ]
63
 
        if tree.has_versioned_directories():
64
 
            expected.append(
65
 
                ('b', 'V', 'directory', tree.path2id('b')))
66
 
        else:
67
 
            expected.append(
68
 
                ('b', '?', 'directory', None))
 
63
        expected.append(
 
64
            ('b', 'V', 'directory', tree.path2id('b')))
69
65
        with tree.lock_read():
70
66
            actual = [(path, status, kind, file_id)
71
67
                for path, status, kind, file_id, ie in
76
72
        work_tree = self.make_branch_and_tree('wt')
77
73
        tree = self.get_tree_no_parents_abc_content(work_tree)
78
74
        expected = [('a', 'V', 'file', tree.path2id('a'))]
79
 
        if tree.has_versioned_directories():
80
 
            expected.append(
81
 
                ('b', 'V', 'directory', tree.path2id('b')))
82
 
        else:
83
 
            expected.append(
84
 
                ('b', '?', 'directory', None))
 
75
        expected.append(
 
76
            ('b', 'V', 'directory', tree.path2id('b')))
85
77
        tree.lock_read()
86
78
        try:
87
79
            actual = [(path, status, kind, file_id)
110
102
        work_tree = self.make_branch_and_tree('wt')
111
103
        tree = self.get_tree_no_parents_abc_content(work_tree)
112
104
        expected = [('a', 'V', 'file', tree.path2id('a'))]
113
 
        if tree.has_versioned_directories():
114
 
            expected.append(
115
 
                ('b', 'V', 'directory', tree.path2id('b')))
116
 
        else:
117
 
            expected.append(('b', '?', 'directory', None))
 
105
        expected.append(
 
106
            ('b', 'V', 'directory', tree.path2id('b')))
118
107
 
119
108
        with tree.lock_read():
120
109
            actual = [(path, status, kind, file_id)