← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patches.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_patches.py
1
 
# Copyright (C) 2004 - 2008 Aaron Bentley, Canonical Ltd
2
 
# <aaron.bentley@utoronto.ca>
 
1
# Copyright (C) 2005-2010 Aaron Bentley, Canonical Ltd
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
13
12
#
14
13
# You should have received a copy of the GNU General Public License
15
14
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
16
 
18
17
 
19
18
import os.path
21
20
from bzrlib.tests import TestCase
22
21
 
23
22
from bzrlib.iterablefile import IterableFile
24
 
from bzrlib.patches import (MalformedLine, 
25
 
                            MalformedHunkHeader, 
26
 
                            MalformedPatchHeader, 
27
 
                            ContextLine, 
 
23
from bzrlib.patches import (MalformedLine,
 
24
                            MalformedHunkHeader,
 
25
                            MalformedPatchHeader,
 
26
                            BinaryPatch,
 
27
                            BinaryFiles,
 
28
                            Patch,
 
29
                            ContextLine,
28
30
                            InsertLine,
29
 
                            RemoveLine, 
30
 
                            difference_index, 
 
31
                            RemoveLine,
 
32
                            difference_index,
31
33
                            get_patch_names,
32
 
                            hunk_from_header, 
33
 
                            iter_patched, 
 
34
                            hunk_from_header,
 
35
                            iter_patched,
 
36
                            iter_patched_from_hunks,
34
37
                            parse_line,
35
38
                            parse_patch,
36
 
                            parse_patches)
 
39
                            parse_patches,
 
40
                            NO_NL)
37
41
 
38
42
 
39
43
class PatchesTester(TestCase):
40
44
 
41
45
    def datafile(self, filename):
42
 
        data_path = os.path.join(os.path.dirname(__file__), 
 
46
        data_path = os.path.join(os.path.dirname(__file__),
43
47
                                 "test_patches_data", filename)
44
48
        return file(data_path, "rb")
45
49
 
 
50
    def data_lines(self, filename):
 
51
        datafile = self.datafile(filename)
 
52
        try:
 
53
            return datafile.readlines()
 
54
        finally:
 
55
            datafile.close()
 
56
 
 
57
    def test_parse_patches_leading_noise(self):
 
58
        # https://bugs.launchpad.net/bzr/+bug/502076
 
59
        # https://code.launchpad.net/~toshio/bzr/allow-dirty-patches/+merge/18854
 
60
        lines = ["diff -pruN commands.py",
 
61
            "--- orig/commands.py",
 
62
            "+++ mod/dommands.py"]
 
63
        bits = parse_patches(iter(lines), allow_dirty=True)
 
64
 
46
65
    def testValidPatchHeader(self):
47
66
        """Parse a valid patch header"""
48
67
        lines = "--- orig/commands.py\n+++ mod/dommands.py\n".split('\n')
111
130
        self.lineThing(" hello\n", ContextLine)
112
131
        self.lineThing("+hello\n", InsertLine)
113
132
        self.lineThing("-hello\n", RemoveLine)
114
 
    
 
133
 
115
134
    def testMalformedLine(self):
116
135
        """Parse invalid valid hunk lines"""
117
136
        self.makeMalformedLine("hello\n")
118
 
    
 
137
 
 
138
    def testMalformedLineNO_NL(self):
 
139
        """Parse invalid '\ No newline at end of file' in hunk lines"""
 
140
        self.makeMalformedLine(NO_NL)
 
141
 
119
142
    def compare_parsed(self, patchtext):
120
143
        lines = patchtext.splitlines(True)
121
144
        patch = parse_patch(lines.__iter__())
130
153
        patchtext = self.datafile("patchtext.patch").read()
131
154
        self.compare_parsed(patchtext)
132
155
 
 
156
    def test_parse_binary(self):
 
157
        """Test parsing a whole patch"""
 
158
        patches = parse_patches(self.data_lines("binary.patch"))
 
159
        self.assertIs(BinaryPatch, patches[0].__class__)
 
160
        self.assertIs(Patch, patches[1].__class__)
 
161
        self.assertContainsRe(patches[0].oldname, '^bar\t')
 
162
        self.assertContainsRe(patches[0].newname, '^qux\t')
 
163
        self.assertContainsRe(str(patches[0]),
 
164
                                  'Binary files bar\t.* and qux\t.* differ\n')
 
165
 
 
166
    def test_parse_binary_after_normal(self):
 
167
        patches = parse_patches(self.data_lines("binary-after-normal.patch"))
 
168
        self.assertIs(BinaryPatch, patches[1].__class__)
 
169
        self.assertIs(Patch, patches[0].__class__)
 
170
        self.assertContainsRe(patches[1].oldname, '^bar\t')
 
171
        self.assertContainsRe(patches[1].newname, '^qux\t')
 
172
        self.assertContainsRe(str(patches[1]),
 
173
                                  'Binary files bar\t.* and qux\t.* differ\n')
 
174
 
 
175
    def test_roundtrip_binary(self):
 
176
        patchtext = ''.join(self.data_lines("binary.patch"))
 
177
        patches = parse_patches(patchtext.splitlines(True))
 
178
        self.assertEqual(patchtext, ''.join(str(p) for p in patches))
 
179
 
133
180
    def testInit(self):
134
181
        """Handle patches missing half the position, range tuple"""
135
182
        patchtext = \
173
220
            ('diff-4', 'orig-4', 'mod-4'),
174
221
            ('diff-5', 'orig-5', 'mod-5'),
175
222
            ('diff-6', 'orig-6', 'mod-6'),
 
223
            ('diff-7', 'orig-7', 'mod-7'),
176
224
        ]
177
225
        for diff, orig, mod in files:
178
226
            patch = self.datafile(diff)
187
235
                count += 1
188
236
            self.assertEqual(count, len(mod_lines))
189
237
 
 
238
    def test_iter_patched_binary(self):
 
239
        binary_lines = self.data_lines('binary.patch')
 
240
        e = self.assertRaises(BinaryFiles, iter_patched, [], binary_lines)
 
241
 
 
242
 
 
243
    def test_iter_patched_from_hunks(self):
 
244
        """Test a few patch files, and make sure they work."""
 
245
        files = [
 
246
            ('diff-2', 'orig-2', 'mod-2'),
 
247
            ('diff-3', 'orig-3', 'mod-3'),
 
248
            ('diff-4', 'orig-4', 'mod-4'),
 
249
            ('diff-5', 'orig-5', 'mod-5'),
 
250
            ('diff-6', 'orig-6', 'mod-6'),
 
251
            ('diff-7', 'orig-7', 'mod-7'),
 
252
        ]
 
253
        for diff, orig, mod in files:
 
254
            parsed = parse_patch(self.datafile(diff))
 
255
            orig_lines = list(self.datafile(orig))
 
256
            mod_lines = list(self.datafile(mod))
 
257
            iter_patched = iter_patched_from_hunks(orig_lines, parsed.hunks)
 
258
            patched_file = IterableFile(iter_patched)
 
259
            lines = []
 
260
            count = 0
 
261
            for patch_line in patched_file:
 
262
                self.assertEqual(patch_line, mod_lines[count])
 
263
                count += 1
 
264
            self.assertEqual(count, len(mod_lines))
 
265
 
190
266
    def testFirstLineRenumber(self):
191
267
        """Make sure we handle lines at the beginning of the hunk"""
192
268
        patch = parse_patch(self.datafile("insert_top.patch"))
227
303
        for patch in patches:
228
304
            patch_files.append((patch.oldname, patch.newname))
229
305
        self.assertEqual(patch_files, filenames)
 
306
 
 
307
    def testStatsValues(self):
 
308
        """Test the added, removed and hunks values for stats_values."""
 
309
        patch = parse_patch(self.datafile("diff"))
 
310
        self.assertEqual((299, 407, 48), patch.stats_values())