/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

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')])
237
238
        self.assertEqual(b'baz', extracted['id3'])
238
239
        self.assertRaises(errors.NoSuchFile, lambda: list(
239
240
                          tree.iter_files_bytes(
240
 
                          [('qux', 'file1-notpresent')])))
 
241
                              [('qux', 'file1-notpresent')])))
241
242
 
242
243
 
243
244
class TestConflicts(TestCaseWithTree):
279
280
        work_tree.add(['a'])
280
281
        tree = self._convert_tree(work_tree)
281
282
        self.assertRaises(errors.NoSuchFile, lambda:
282
 
            list(tree.iter_child_entries('unknown')))
 
283
                          list(tree.iter_child_entries('unknown')))
283
284
 
284
285
 
285
286
class TestHasId(TestCaseWithTree):