/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: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

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
15
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
17
 
17
18
from breezy.errors import BinaryFile
18
 
from breezy.patch import diff3
 
19
from breezy.patch import diff3, PatchInvokeError, run_patch
19
20
from breezy.tests import TestCaseInTempDir
20
21
 
21
22
 
29
30
        with open('base', 'wb') as f:
30
31
            f.write(b'\x00')
31
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')