/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_tree.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:
breezy/tests/per_tree/test_tree.py
57
57
        self.build_tree_contents([('wta/file', b'b\nc\nd\ne\n')])
58
58
        tree_a = self.workingtree_to_test_tree(work_a)
59
59
        if getattr(tree_a, 'plan_file_merge', None) is None:
60
 
            raise tests.TestNotApplicable('Tree does not support plan_file_merge')
 
60
            raise tests.TestNotApplicable(
 
61
                'Tree does not support plan_file_merge')
61
62
        tree_a.lock_read()
62
63
        self.addCleanup(tree_a.unlock)
63
64
        self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
248
249
        self.assertEqual(b'baz', extracted['id3'])
249
250
        self.assertRaises(errors.NoSuchFile, lambda: list(
250
251
                          tree.iter_files_bytes(
251
 
                          [('qux', 'file1-notpresent')])))
 
252
                              [('qux', 'file1-notpresent')])))
252
253
 
253
254
 
254
255
class TestConflicts(TestCaseWithTree):
280
281
        work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
281
282
        tree = self._convert_tree(work_tree)
282
283
        output = [e.name for e in
283
 
            tree.iter_child_entries('', tree.get_root_id())]
 
284
                  tree.iter_child_entries('', tree.get_root_id())]
284
285
        self.assertEqual({'a', 'f'}, set(output))
285
286
        output = [e.name for e in
286
 
            tree.iter_child_entries('a', tree.path2id('a'))]
 
287
                  tree.iter_child_entries('a', tree.path2id('a'))]
287
288
        self.assertEqual({'b', 'd'}, set(output))
288
289
 
289
290
    def test_does_not_exist(self):
292
293
        work_tree.add(['a'])
293
294
        tree = self._convert_tree(work_tree)
294
295
        self.assertRaises(errors.NoSuchFile, lambda:
295
 
            list(tree.iter_child_entries('unknown')))
 
296
                          list(tree.iter_child_entries('unknown')))
296
297
 
297
298
 
298
299
class TestHasId(TestCaseWithTree):