~bzr-pqm/bzr/bzr.dev

2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2006 Canonical Ltd
1558.15.7 by Aaron Bentley
Add copyright statements
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1558.15.7 by Aaron Bentley
Add copyright statements
16
1558.15.6 by Aaron Bentley
Added more tests
17
from bzrlib.errors import BinaryFile
18
from bzrlib.patch import diff3
19
from bzrlib.tests import TestCaseInTempDir
20
1558.15.8 by Aaron Bentley
Whitespace fixes
21
1558.15.6 by Aaron Bentley
Added more tests
22
class TestPatch(TestCaseInTempDir):
1558.15.8 by Aaron Bentley
Whitespace fixes
23
1558.15.6 by Aaron Bentley
Added more tests
24
    def test_diff3_binaries(self):
25
        file('this', 'wb').write('a')
26
        file('other', 'wb').write('a')
27
        file('base', 'wb').write('\x00')
28
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')