/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_test_trees.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_test_trees.py
141
141
        self.addCleanup(tree.unlock)
142
142
        self.assertEqual([], tree.get_parent_ids())
143
143
        self.assertEqual([], tree.conflicts())
144
 
        if tree.has_versioned_directories() or not tree.has_filename('b'):
145
 
            self.assertEqual([], list(tree.unknowns()))
146
 
        else:
147
 
            self.assertEqual(['b'], list(tree.unknowns()))
 
144
        self.assertEqual([], list(tree.unknowns()))
148
145
        # __iter__ has no strongly defined order
149
146
        expected_paths = (
150
147
            ['', 'a']
169
166
        self.addCleanup(tree.unlock)
170
167
        self.assertEqual([], tree.get_parent_ids())
171
168
        self.assertEqual([], tree.conflicts())
172
 
        if tree.has_versioned_directories() or not tree.has_filename('1top-dir/1dir-in-1topdir'):
173
 
            self.assertEqual([], list(tree.unknowns()))
174
 
        else:
175
 
            self.assertEqual(['1top-dir/1dir-in-1topdir'],
176
 
                             list(tree.unknowns()))
 
169
        self.assertEqual([], list(tree.unknowns()))
177
170
        # __iter__ has no strongly defined order
178
171
        tree_root = tree.path2id('')
179
172
        try:
227
220
        self.addCleanup(tree.unlock)
228
221
        self.assertEqual([], tree.get_parent_ids())
229
222
        self.assertEqual([], tree.conflicts())
230
 
        if tree.has_versioned_directories() or not tree.has_filename('1top-dir/1dir-in-1topdir'):
231
 
            self.assertEqual([], list(tree.unknowns()))
232
 
        else:
233
 
            self.assertEqual(['1top-dir/1dir-in-1topdir'],
234
 
                             list(tree.unknowns()))
 
223
        self.assertEqual([], list(tree.unknowns()))
235
224
        # __iter__ has no strongly defined order
236
225
        tree_root = tree.path2id('')
237
226
        if tree.has_versioned_directories():