/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 10:19:02 UTC
  • mfrom: (6973.7.13 python3-g-real)
  • Revision ID: breezy.the.bot@gmail.com-20180630101902-thpqkbi44kqom06g
Fix more tests.

Merged from https://code.launchpad.net/~jelmer/brz/python3-g/+merge/348134

Show diffs side-by-side

added added

removed removed

Lines of Context:
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')