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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:19:12 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20181116231912-e043vpq22bdkxa6q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_patch.py
22
22
class TestPatch(TestCaseInTempDir):
23
23
 
24
24
    def test_diff3_binaries(self):
25
 
        with open('this', 'wb') as f: f.write(b'a')
26
 
        with open('other', 'wb') as f: f.write(b'a')
27
 
        with open('base', 'wb') as f: f.write(b'\x00')
 
25
        with open('this', 'wb') as f:
 
26
            f.write(b'a')
 
27
        with open('other', 'wb') as f:
 
28
            f.write(b'a')
 
29
        with open('base', 'wb') as f:
 
30
            f.write(b'\x00')
28
31
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')