1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
# vim: set fileencoding=utf-8 :
# (C) 2012,2015 Guido Günther <agx@sigxcpu.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, please see
# <http://www.gnu.org/licenses/>
"""Test L{gbp.pq}"""
from . import context
from . import testutils
import os
import unittest
from gbp.scripts.pq import generate_patches, export_patches
import gbp.scripts.common.pq as pq
import gbp.patch_series
class TestApplyAndCommit(testutils.DebianGitTestRepo):
"""Test L{gbp.pq}'s apply_and_commit"""
def setUp(self):
testutils.DebianGitTestRepo.setUp(self)
self.add_file('bar')
def test_apply_and_commit_patch(self):
"""Test applying a single patch"""
patch = gbp.patch_series.Patch(_patch_path('foo.patch'))
pq.apply_and_commit_patch(self.repo, patch, None)
self.assertIn('foo', self.repo.list_files())
def test_topic(self):
"""Test if setting a topic works"""
patch = gbp.patch_series.Patch(_patch_path('foo.patch'))
pq.apply_and_commit_patch(self.repo, patch, None, topic='foobar')
info = self.repo.get_commit_info('HEAD')
self.assertIn('Gbp-Pq: Topic foobar', info['body'])
def test_name(self):
"""Test if setting a name works"""
patch = gbp.patch_series.Patch(_patch_path('foo.patch'))
pq.apply_and_commit_patch(self.repo, patch, None, name='foobar')
info = self.repo.get_commit_info('HEAD')
self.assertIn('Gbp-Pq: Name foobar', info['body'])
@unittest.skipIf(not os.path.exists('/usr/bin/dpkg'), 'Dpkg not found')
def test_debian_missing_author(self):
"""
Check if we parse the author from debian control
if it's missing in the patch.
"""
def _check_log(msg):
self.assertEqual(msg, "Patch 'foo.patch' has no authorship "
"information, using 'Guido Günther <gg@godiug.net>'")
patch = gbp.patch_series.Patch(_patch_path('foo.patch'))
# Overwrite data parsed from patch:
patch.author
patch.info['author'] = None
patch.info['email'] = None
# Fake a control file
self.add_file("debian/control",
"Maintainer: Guido Günther <gg@godiug.net>")
maintainer = pq.get_maintainer_from_control(self.repo)
orig_warn = gbp.log.warn
gbp.log.warn = _check_log
pq.apply_and_commit_patch(self.repo, patch, maintainer)
gbp.log.warn = orig_warn
info = self.repo.get_commit_info('HEAD')
self.assertEqual(info['author'].email, 'gg@godiug.net')
self.assertIn('foo', self.repo.list_files())
class TestApplySinglePatch(testutils.DebianGitTestRepo):
"""Test L{gbp.pq}'s apply_single_patch"""
def setUp(self):
testutils.DebianGitTestRepo.setUp(self)
self.add_file('bar')
def test_apply_single_patch(self):
"""Test applying a single patch"""
patch = gbp.patch_series.Patch(_patch_path('foo.patch'))
pq.apply_single_patch(self.repo, 'master', patch, None)
self.assertIn('foo', self.repo.list_files())
class TestWritePatch(testutils.DebianGitTestRepo):
"""Test L{gbp.pq}'s write_patch """
def setUp(self):
testutils.DebianGitTestRepo.setUp(self)
self.add_file('bar', 'bar')
def tearDown(self):
context.teardown()
def _test_generate_patches(self, changes, expected_patches, opts):
self.assertEqual(len(changes), len(expected_patches))
d = context.new_tmpdir(__name__)
expected_paths = [os.path.join(str(d), n) for n in expected_patches ]
# Commit changes
for c in changes:
self.add_file(c[0], c[1], c[2])
# Write it out as patch and check its existence
origin = 'HEAD~%d' % len(changes)
patchfiles = generate_patches(self.repo, origin, 'HEAD', str(d), opts)
for expected in expected_paths:
self.assertIn(expected, patchfiles)
self.assertTrue(os.path.exists(expected))
# Reapply the patch to a new branch
self.repo.create_branch('testapply', origin)
self.repo.set_branch('testapply')
for expected in expected_paths:
self.repo.apply_patch(expected)
self.repo.commit_all("foo")
diff = self.repo.diff('master', 'testapply')
# Branches must be identical afterwards
self.assertEqual('', diff)
def test_generate_patches(self):
"""Test generation of patches"""
class opts:
patch_numbers = False
renumber = False
patch_num_format = '%04d-'
expected_patches = [ 'gbptest/added-foo.patch',
'gbptest/patchname.diff' ]
changes = [ ('foo', 'foo', ("added foo\n\n"
"Gbp-Pq: Topic gbptest")),
('baz', 'baz', ("added bar\n\n"
"Gbp-Pq: Topic gbptest\n"
"Gbp-Pq: Name patchname.diff")) ]
self._test_generate_patches(changes, expected_patches, opts)
def test_generate_renumbered_patches(self):
"""Test generation of renumbered patches"""
class opts:
patch_numbers = True
renumber = True
patch_num_format = '%02d_'
expected_patches = [ 'gbptest/01_added-foo.patch',
'gbptest/02_patchname.diff' ]
changes = [ ('foo', 'foo', ("added foo\n\n"
"Gbp-Pq: Topic gbptest")),
('baz', 'baz', ("added bar\n\n"
"Gbp-Pq: Topic gbptest\n"
"Gbp-Pq: Name 099-patchname.diff")) ]
self._test_generate_patches(changes, expected_patches, opts)
def test_generate_patches_with_name_clashes(self):
"""Test generation of patches which have name clashes"""
class opts:
patch_numbers = False
renumber = True
patch_num_format = '%02d_'
expected_patches = [ 'gbptest/added-foo.patch',
'gbptest/patchname.diff',
'gbptest/patchname-1.diff',
'gbptest/patchname-2.diff' ]
changes = [ ('foo', 'foo', ("added foo\n\n"
"Gbp-Pq: Topic gbptest")),
('baz', 'baz', ("added bar\n\n"
"Gbp-Pq: Topic gbptest\n"
"Gbp-Pq: Name 099-patchname.diff")),
('qux', 'qux', ("added qux\n\n"
"Gbp-Pq: Topic gbptest\n"
"Gbp-Pq: Name 100-patchname.diff")),
('norf', 'norf', ("added norf\n\n"
"Gbp-Pq: Topic gbptest\n"
"Gbp-Pq: Name 101-patchname.diff")) ]
self._test_generate_patches(changes, expected_patches, opts)
class TestExport(testutils.DebianGitTestRepo):
class Options(object):
drop = True
patch_numbers = False
def setUp(self):
testutils.DebianGitTestRepo.setUp(self)
self.add_file('bar', 'bar')
def test_drop(self):
"""Test if we drop the patch-queue branch with --drop"""
repo = self.repo
start = repo.get_branch()
pq_branch = os.path.join('patch-queue', start)
pq.switch_pq(repo, start)
self.assertEqual(repo.get_branch(), pq_branch)
export_patches(repo, pq_branch, TestExport.Options)
self.assertEqual(repo.get_branch(), start)
self.assertFalse(repo.has_branch(pq_branch))
class TestParseGbpCommand(unittest.TestCase):
def test_empty_body(self):
"""Test command filtering with an empty body"""
info = {'body': ''}
(cmds, body) = pq.parse_gbp_commands(info, ['tag'], ['cmd1'], ['cmd2'])
self.assertEquals(cmds, {})
self.assertEquals(body, '')
def test_noarg_cmd(self):
orig_body = '\n'.join(["Foo",
"tag: cmd1"])
info = {'body': orig_body}
(cmds, body) = pq.parse_gbp_commands(info, 'tag', ['cmd'], ['argcmd'])
self.assertEquals(cmds, {'cmd': None})
self.assertEquals(body, orig_body)
def test_filter_cmd(self):
orig_body = '\n'.join(["Foo",
"tag: cmd1"])
info = {'body': orig_body}
(cmds, body) = pq.parse_gbp_commands(info, 'tag', ['cmd'], ['argcmd'], ['cmd'])
self.assertEquals(cmds, {'cmd': None})
self.assertEquals(body, 'Foo')
def _patch_path(name):
return os.path.join(context.projectdir, 'tests/data', name)
|
