~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patch.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

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')