/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 bzrlib/tests/test_patch.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_patch.py
1
1
# Copyright (C) 2006 Canonical Ltd
2
 
# Copyright (C) 2008 Aaron Bentley <aaron@aaronbentley.com>
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
16
 
18
 
from breezy.errors import BinaryFile
19
 
from breezy.patch import diff3, PatchInvokeError, run_patch
20
 
from breezy.tests import TestCaseInTempDir
 
17
from bzrlib.errors import BinaryFile
 
18
from bzrlib.patch import diff3
 
19
from bzrlib.tests import TestCaseInTempDir
21
20
 
22
21
 
23
22
class TestPatch(TestCaseInTempDir):
24
23
 
25
24
    def test_diff3_binaries(self):
26
 
        with open('this', 'wb') as f:
27
 
            f.write(b'a')
28
 
        with open('other', 'wb') as f:
29
 
            f.write(b'a')
30
 
        with open('base', 'wb') as f:
31
 
            f.write(b'\x00')
 
25
        file('this', 'wb').write('a')
 
26
        file('other', 'wb').write('a')
 
27
        file('base', 'wb').write('\x00')
32
28
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')
33
 
 
34
 
 
35
 
class TestPatch(TestCaseInTempDir):
36
 
 
37
 
    def test_missing_patch(self):
38
 
        self.assertRaises(PatchInvokeError, run_patch, '.', [],
39
 
                          _patch_cmd='/unlikely/to/exist')