← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patch.py

  • Committer: Aaron Bentley
  • Date: 2006-04-16 17:26:33 UTC
  • mto: This revision was merged to the branch mainline in revision 1673.
  • Revision ID: aaron.bentley@utoronto.ca-20060416172633-4841d41fc9724d63
Added more tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_patch.py
 
1
from bzrlib.errors import BinaryFile
 
2
from bzrlib.patch import diff3
 
3
from bzrlib.tests import TestCaseInTempDir
 
4
 
 
5
class TestPatch(TestCaseInTempDir):
 
6
    def test_diff3_binaries(self):
 
7
        file('this', 'wb').write('a')
 
8
        file('other', 'wb').write('a')
 
9
        file('base', 'wb').write('\x00')
 
10
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')
 
11
 
 
12