~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patch.py

  • Committer: Jelmer Vernooij
  • Date: 2016-04-03 16:32:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6617.
  • Revision ID: jelmer@jelmer.uk-20160403163231-h72bo0uyek2gikw0
Don't put French text in doc/en/user-reference when LANGUAGE=fr_CH.UTF_8.

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
 
        file('this', 'wb').write('a')
26
 
        file('other', 'wb').write('a')
27
 
        file('base', 'wb').write('\x00')
 
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')
28
28
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')