/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-06 01:18:08 UTC
  • mfrom: (7143 work)
  • mto: This revision was merged to the branch mainline in revision 7151.
  • Revision ID: jelmer@jelmer.uk-20181106011808-y870f4vq0ork3ahu
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 file('this', 'wb') as f: f.write('a')
26
 
        with file('other', 'wb') as f: f.write('a')
27
 
        with file('base', 'wb') as f: f.write('\x00')
 
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')
28
28
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')