/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-12-22 12:06:17 UTC
  • mfrom: (7413.2.3 patch-api)
  • Revision ID: breezy.the.bot@gmail.com-20191222120617-ygwv45iv25le0yty
Add iter_patched_from_hunks implementation that calls out to the patch command.

Merged from https://code.launchpad.net/~jelmer/brz/patch-api/+merge/375876

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
 
18
import os
 
19
 
 
20
from breezy.iterablefile import IterableFile
18
21
from breezy.errors import BinaryFile
19
 
from breezy.patch import diff3, PatchInvokeError, run_patch
20
 
from breezy.tests import TestCaseInTempDir
 
22
from breezy.patch import diff3, PatchInvokeError, run_patch, iter_patched_from_hunks
 
23
from breezy.patches import parse_patch
 
24
from breezy.tests import TestCaseInTempDir, TestCase
21
25
 
22
26
 
23
27
class TestPatch(TestCaseInTempDir):
37
41
    def test_missing_patch(self):
38
42
        self.assertRaises(PatchInvokeError, run_patch, '.', [],
39
43
                          _patch_cmd='/unlikely/to/exist')
 
44
 
 
45
 
 
46
class PatchesTester(TestCase):
 
47
 
 
48
    def datafile(self, filename):
 
49
        data_path = os.path.join(os.path.dirname(__file__),
 
50
                                 "test_patches_data", filename)
 
51
        return open(data_path, "rb")
 
52
 
 
53
    def data_lines(self, filename):
 
54
        with self.datafile(filename) as datafile:
 
55
            return datafile.readlines()
 
56
 
 
57
    def test_iter_patched_from_hunks(self):
 
58
        """Test a few patch files, and make sure they work."""
 
59
        files = [
 
60
            ('diff-2', 'orig-2', 'mod-2'),
 
61
            ('diff-3', 'orig-3', 'mod-3'),
 
62
            ('diff-4', 'orig-4', 'mod-4'),
 
63
            ('diff-5', 'orig-5', 'mod-5'),
 
64
            ('diff-6', 'orig-6', 'mod-6'),
 
65
            ('diff-7', 'orig-7', 'mod-7'),
 
66
        ]
 
67
        for diff, orig, mod in files:
 
68
            parsed = parse_patch(self.datafile(diff))
 
69
            orig_lines = list(self.datafile(orig))
 
70
            mod_lines = list(self.datafile(mod))
 
71
            iter_patched = iter_patched_from_hunks(orig_lines, parsed.hunks)
 
72
            patched_file = IterableFile(iter_patched)
 
73
            count = 0
 
74
            for patch_line in patched_file:
 
75
                self.assertEqual(patch_line, mod_lines[count], 'for file %s' % diff)
 
76
                count += 1
 
77
            self.assertEqual(count, len(mod_lines))