/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_diff.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:
breezy/tests/test_diff.py
326
326
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
327
327
 
328
328
        cmd = ['diff', '-u', '--binary', 'old', 'new']
329
 
        with open('old', 'wb') as f: f.write('\x00foobar\n')
330
 
        with open('new', 'wb') as f: f.write('foo\x00bar\n')
 
329
        with open('old', 'wb') as f: f.write(b'\x00foobar\n')
 
330
        with open('new', 'wb') as f: f.write(b'foo\x00bar\n')
331
331
        pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
332
332
                                     stdin=subprocess.PIPE)
333
333
        out, err = pipe.communicate()