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
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
|
# Copyright (C) 2005, 2006 by Canonical Ltd
#
# 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, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Test cases for pqm submit."""
import smtplib
from bzrlib import (
config as _mod_config,
errors,
gpg,
)
from bzrlib.plugins.pqm import pqm_submit
from bzrlib.tests import TestCaseWithMemoryTransport, TestCaseWithTransport
EMAIL = """\
From: "J. Random Hacker" <jrandom@example.com>
Subject: commit message
To: PQM <pqm@example.com>
User-Agent: Bazaar \(.*\)
-----BEGIN PSEUDO-SIGNED CONTENT-----
star-merge .*/public/ http://example.com/submit
-----END PSEUDO-SIGNED CONTENT-----
"""
class PQMSubmissionTests(TestCaseWithMemoryTransport):
def test_no_source_branch(self):
self.assertRaises(
errors.NoMergeSource, pqm_submit.PQMSubmission,
source_branch=None)
def test_newlines_in_message(self):
source_branch = self.make_branch('source')
self.assertRaises(pqm_submit.BadCommitMessage,
pqm_submit.PQMSubmission,
source_branch=source_branch,
public_location='public-branch',
submit_location='submit-branch',
message='foo\nbar')
def test_check_tree_clean(self):
tree = self.make_branch_and_memory_tree('source')
submission = pqm_submit.PQMSubmission(
source_branch=tree.branch,
public_location=tree.branch.base,
submit_location='submit-branch',
message='not much to say',
tree=tree,
)
submission.check_tree()
def test_check_tree_no_tree(self):
branch = self.make_branch('source')
submission = pqm_submit.PQMSubmission(
source_branch=branch,
public_location=branch.base,
submit_location='submit-branch',
message='not much to say',
tree=None,
)
submission.check_tree()
def test_check_tree_dirty(self):
tree = self.make_branch_and_memory_tree('source')
tree.lock_write()
try:
tree.add('')
submission = pqm_submit.PQMSubmission(
source_branch=tree.branch,
public_location=tree.branch.base,
submit_location='submit-branch',
message='not much to say',
tree=tree,
)
self.assertRaises(errors.UncommittedChanges, submission.check_tree)
finally:
tree.unlock()
def test_check_public_branch(self):
tree = self.make_branch_and_memory_tree('source')
source_branch = tree.branch
public_branch = self.make_branch('public')
# Commit something to the source branch
tree.lock_write()
tree.add('')
tree.commit('message')
tree.unlock()
# Now the public branch is out of date:
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location=public_branch.base,
submit_location='submit-branch',
message='merge message')
self.assertRaises(errors.PublicBranchOutOfDate,
submission.check_public_branch)
# If we bring the public branch up to date, everything is fine.
public_branch.pull(source_branch)
submission.check_public_branch()
def test_check_public_branch_missing(self):
source_branch = self.make_branch('source')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location=self.get_transport().abspath('public'),
submit_location='submit-branch',
message='merge message')
self.assertRaises(errors.NotBranchError,
submission.check_public_branch)
def test_to_lines(self):
source_branch = self.make_branch('source')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location='public-branch',
submit_location='submit-branch',
message='commit message')
lines = submission.to_lines()
self.assertEqual(['star-merge public-branch submit-branch\n'], lines)
def test_to_signed(self):
source_branch = self.make_branch('source')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location='public-branch',
submit_location='submit-branch',
message='commit message')
old_strategy = gpg.GPGStrategy
gpg.GPGStrategy = gpg.LoopbackGPGStrategy
try:
signed = submission.to_signed()
finally:
gpg.GPGStrategy = old_strategy
self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n'
'star-merge public-branch submit-branch\n'
'-----END PSEUDO-SIGNED CONTENT-----\n', signed)
def test_to_email(self):
source_branch = self.make_branch('source')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location='public-branch',
submit_location='submit-branch',
message='commit message')
message = submission.to_email('from@example.com', 'to@example.com',
sign=False)
self.assertEqual('from@example.com', message.get('From'))
self.assertEqual('to@example.com', message.get('To'))
self.assertEqual('commit message', message.get('Subject'))
def test_to_unicode_email(self):
"""Subject has to be raw UTF-8 not email encoded."""
source_branch = self.make_branch('source')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location='public-branch',
submit_location='submit-branch',
message=u'Commit m\xe5ss\xb5ge')
message = submission.to_email('from@example.com', 'to@example.com',
sign=False)
self.assertEqual('from@example.com', message.get('From'))
self.assertEqual('to@example.com', message.get('To'))
self.assertEqual('Commit m\xc3\xa5ss\xc2\xb5ge',
message.get('Subject'))
def test_submit_branch_public_location(self):
source_branch = self.make_branch('source')
public_branch = self.make_branch('public')
submit_branch = self.make_branch('submit')
submit_public_branch = self.make_branch('submit_public')
submit_branch.set_public_branch(submit_public_branch.base)
source_branch.set_submit_branch(submit_branch.base)
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location='public',
message=u'Commit m\xe5ss\xb5ge')
self.assertEqual(submit_public_branch.base, submission.submit_location)
class PQMSubmissionLocationsTests(TestCaseWithTransport):
def test_find_public_branch(self):
source_branch = self.make_branch('source')
source_branch.set_public_branch('http://example.com/public')
# Also set the deprecated public_repository config item to
# show that public_branch is used in preference to it.
source_branch.get_config().set_user_option(
'public_repository', 'bad-value')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
submit_location='submit-branch',
message='commit message')
self.assertEqual('http://example.com/public',
submission.public_location)
def test_find_public_branch_from_repo(self):
# Test that public_location can be inferred from the obsolete
# "public_repository" config option.
source_repo = self.make_repository('repo', shared=True)
source_branch = self.make_bzrdir('repo/source').create_branch()
config = _mod_config.LocationConfig(
source_repo.bzrdir.root_transport.base)
config.set_user_option(
'public_repository', 'http://example.com/repo',
store=_mod_config.STORE_LOCATION_NORECURSE)
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
submit_location='submit-branch',
message='commit message')
self.assertEqual('http://example.com/repo/source',
submission.public_location)
def test_find_public_branch_missing(self):
source_branch = self.make_branch('source')
self.assertRaises(
errors.BzrCommandError, pqm_submit.PQMSubmission,
source_branch=source_branch,
submit_location='submit-branch',
message='commit message')
def test_find_submit_branch(self):
source_branch = self.make_branch('source')
source_branch.set_submit_branch('http://example.com/submit')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location='public-branch',
message='commit message')
self.assertEqual('http://example.com/submit',
submission.submit_location)
def test_find_submit_branch_from_pqm_branch(self):
# Test that submit_branch can be picked up from the obsolete
# pqm_branch config option.
source_branch = self.make_branch('source')
source_branch.get_config().set_user_option(
'pqm_branch', 'http://example.com/submit')
# pqm_branch is used in preference to the submit_branch:
source_branch.set_submit_branch('bad-value')
submission = pqm_submit.PQMSubmission(
source_branch=source_branch,
public_location='public-branch',
message='commit message')
self.assertEqual('http://example.com/submit',
submission.submit_location)
def test_find_submit_branch_missing(self):
source_branch = self.make_branch('source')
self.assertRaises(
errors.NoSubmitBranch, pqm_submit.PQMSubmission,
source_branch=source_branch,
public_location='public-branch',
message='commit message')
def run_bzr_fakemail(self, *args, **kwargs):
# Run with fake smtplib and gpg stubs in place:
sendmail_calls = []
def sendmail(self, from_, to, message):
sendmail_calls.append((self, from_, to, message))
connect_calls = []
def connect(self, host='localhost', port=0):
connect_calls.append((self, host, port))
def ehlo(self):
return (200, 'Ok')
def has_extn(self, extn):
return False
def starttls(self):
pass
old_sendmail = smtplib.SMTP.sendmail
smtplib.SMTP.sendmail = sendmail
old_connect = smtplib.SMTP.connect
smtplib.SMTP.connect = connect
old_ehlo = smtplib.SMTP.ehlo
smtplib.SMTP.ehlo = ehlo
old_has_extn = smtplib.SMTP.has_extn
smtplib.SMTP.has_extn = has_extn
old_starttls = smtplib.SMTP.starttls
smtplib.SMTP.starttls = starttls
old_strategy = gpg.GPGStrategy
gpg.GPGStrategy = gpg.LoopbackGPGStrategy
try:
result = self.run_bzr(*args, **kwargs)
finally:
smtplib.SMTP.sendmail = old_sendmail
smtplib.SMTP.connect = old_connect
smtplib.SMTP.ehlo = old_ehlo
smtplib.SMTP.has_extn = old_has_extn
smtplib.SMTP.starttls = old_starttls
gpg.GPGStrategy = old_strategy
return result + (connect_calls, sendmail_calls)
def test_pqm_submit(self):
source_branch = self.make_branch('source')
public_branch = self.make_branch('public')
source_branch.set_public_branch(public_branch.base)
source_branch.set_submit_branch('http://example.com/submit')
config = source_branch.get_config()
config.set_user_option('pqm_email', 'PQM <pqm@example.com>')
config.set_user_option(
'email', 'J. Random Hacker <jrandom@example.com>')
out, err, connect_calls, sendmail_calls = \
self.run_bzr_fakemail(['pqm-submit', '-m', 'commit message',
'./source'])
self.assertEqual('', out)
self.assertEqual(1, len(connect_calls))
call = connect_calls[0]
self.assertEqual(('localhost', 0), call[1:3])
self.assertEqual(1, len(sendmail_calls))
call = sendmail_calls[0]
self.assertEqual(('jrandom@example.com', ['pqm@example.com']),
call[1:3])
self.assertContainsRe(call[3], EMAIL)
def test_dirty_pqm_submit(self):
source_tree = self.make_branch_and_tree('source')
self.build_tree(['source/foo'])
source_tree.add(['foo'])
public_branch = self.make_branch('public')
source_tree.branch.set_public_branch(public_branch.base)
source_tree.branch.set_submit_branch('http://example.com/submit')
config = source_tree.branch.get_config()
config.set_user_option('pqm_email', 'PQM <pqm@example.com>')
config.set_user_option(
'email', 'J. Random Hacker <jrandom@example.com>')
out, err, connect_calls, sendmail_calls = \
self.run_bzr_fakemail(['pqm-submit', '-m', 'commit message',
'./source'],
retcode=3)
self.assertContainsRe(err,
r'Working tree ".*/source/" has uncommitted changes\.')
def test_submit_subdir_of_branch(self):
source_branch = self.make_branch('source')
source_branch.set_submit_branch('http://example.com/submit')
config = source_branch.get_config()
out, err, connect_calls, sendmail_calls = \
self.run_bzr_fakemail(['pqm-submit', '-m', 'commit message',
'./source/subdir'],
retcode=3)
self.assertContainsRe(err, 'bzr: ERROR: No working tree was found')
def test_submit_branch(self):
"""Test that --submit-branch overrides local config."""
source_branch = self.make_branch('source')
public_branch = self.make_branch('public')
source_branch.set_public_branch(public_branch.base)
source_branch.set_submit_branch('http://a/very/different/branch')
config = source_branch.get_config()
config.set_user_option('pqm_email', 'PQM <pqm@example.com>')
config.set_user_option(
'email', 'J. Random Hacker <jrandom@example.com>')
(out, err, connect_calls,
sendmail_calls) = self.run_bzr_fakemail(
['pqm-submit', '-m', 'commit message',
'--submit-branch', 'http://example.com/submit',
'./source'
])
self.assertEqual('', out)
self.assertEqual(1, len(connect_calls))
call = connect_calls[0]
self.assertEqual(('localhost', 0), call[1:3])
self.assertEqual(1, len(sendmail_calls))
call = sendmail_calls[0]
self.assertEqual(('jrandom@example.com', ['pqm@example.com']),
call[1:3])
self.assertContainsRe(call[3], EMAIL)
|