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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-10-13 18:52:37 UTC
  • mfrom: (7385.2.3 init-shared-repo)
  • Revision ID: breezy.the.bot@gmail.com-20191013185237-dysn3in6iw908mse
Rename init-repo to init-shared-repo.

Merged from https://code.launchpad.net/~jelmer/brz/init-shared-repo/+merge/372116

Show diffs side-by-side

added added

removed removed

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