← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_send.py

  • Committer: Kit Randel
  • Date: 2014-12-15 20:24:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6602.
  • Revision ID: kit.randel@canonical.com-20141215202442-usf2ixhypqg8yh6q
added a note for bug-1400567 to the 2.7b release notes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012 Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
19
 
import sys
20
19
from cStringIO import StringIO
21
20
 
22
21
from bzrlib import (
23
22
    branch,
24
 
    bzrdir,
25
23
    merge_directive,
26
24
    tests,
27
25
    )
 
26
from bzrlib.controldir import ControlDir
28
27
from bzrlib.bundle import serializer
29
28
from bzrlib.transport import memory
30
 
 
31
 
 
32
 
def load_tests(standard_tests, module, loader):
33
 
    """Multiply tests for the send command."""
34
 
    result = loader.suiteClass()
35
 
 
36
 
    # one for each king of change
37
 
    changes_tests, remaining_tests = tests.split_suite_by_condition(
38
 
        standard_tests, tests.condition_isinstance((
39
 
                TestSendStrictWithChanges,
40
 
                )))
41
 
    changes_scenarios = [
42
 
        ('uncommitted',
43
 
         dict(_changes_type='_uncommitted_changes')),
44
 
        ('pending_merges',
45
 
         dict(_changes_type='_pending_merges')),
46
 
        ('out-of-sync-trees',
47
 
         dict(_changes_type='_out_of_sync_trees')),
48
 
        ]
49
 
    tests.multiply_tests(changes_tests, changes_scenarios, result)
50
 
    # No parametrization for the remaining tests
51
 
    result.addTests(remaining_tests)
52
 
 
53
 
    return result
 
29
from bzrlib.tests import (
 
30
    scenarios,
 
31
    )
 
32
from bzrlib.tests.matchers import ContainsNoVfsCalls
 
33
 
 
34
 
 
35
load_tests = scenarios.load_tests_apply_scenarios
54
36
 
55
37
 
56
38
class TestSendMixin(object):
80
62
 
81
63
    def setUp(self):
82
64
        super(TestSend, self).setUp()
83
 
        grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
 
65
        grandparent_tree = ControlDir.create_standalone_workingtree(
84
66
            'grandparent')
85
67
        self.build_tree_contents([('grandparent/file1', 'grandparent')])
86
68
        grandparent_tree.add('file1')
206
188
 
207
189
    def test_note_revisions(self):
208
190
        stderr = self.run_send([])[1]
209
 
        self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
 
191
        self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
210
192
 
211
193
    def test_mailto_option(self):
212
194
        b = branch.Branch.open('branch')
213
 
        b.get_config().set_user_option('mail_client', 'editor')
 
195
        b.get_config_stack().set('mail_client', 'editor')
214
196
        self.run_bzr_error(
215
197
            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
216
198
            ), 'send -f branch')
217
 
        b.get_config().set_user_option('mail_client', 'bogus')
 
199
        b.get_config_stack().set('mail_client', 'bogus')
218
200
        self.run_send([])
219
 
        self.run_bzr_error(('Unknown mail client: bogus',),
 
201
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
220
202
                           'send -f branch --mail-to jrandom@example.org')
221
 
        b.get_config().set_user_option('submit_to', 'jrandom@example.org')
222
 
        self.run_bzr_error(('Unknown mail client: bogus',),
 
203
        b.get_config_stack().set('submit_to', 'jrandom@example.org')
 
204
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
223
205
                           'send -f branch')
224
206
 
225
207
    def test_mailto_child_option(self):
226
208
        """Make sure that child_submit_to is used."""
227
209
        b = branch.Branch.open('branch')
228
 
        b.get_config().set_user_option('mail_client', 'bogus')
 
210
        b.get_config_stack().set('mail_client', 'bogus')
229
211
        parent = branch.Branch.open('parent')
230
 
        parent.get_config().set_user_option('child_submit_to',
231
 
                           'somebody@example.org')
232
 
        self.run_bzr_error(('Unknown mail client: bogus',),
233
 
                           'send -f branch')
 
212
        parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
 
213
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
 
214
                'send -f branch')
234
215
 
235
216
    def test_format(self):
236
217
        md = self.get_MD(['--format=4'])
248
229
                            'send -f branch -o- --format=0.999')[0]
249
230
 
250
231
    def test_format_child_option(self):
251
 
        parent_config = branch.Branch.open('parent').get_config()
252
 
        parent_config.set_user_option('child_submit_format', '4')
 
232
        br = branch.Branch.open('parent')
 
233
        conf = br.get_config_stack()
 
234
        conf.set('child_submit_format', '4')
253
235
        md = self.get_MD([])
254
236
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
255
237
 
256
 
        parent_config.set_user_option('child_submit_format', '0.9')
 
238
        conf.set('child_submit_format', '0.9')
257
239
        md = self.get_MD([])
258
240
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
259
241
 
261
243
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
262
244
        self.assertIs(merge_directive.MergeDirective, md.__class__)
263
245
 
264
 
        parent_config.set_user_option('child_submit_format', '0.999')
 
246
        conf.set('child_submit_format', '0.999')
265
247
        self.run_bzr_error(["No such send format '0.999'"],
266
248
                            'send -f branch -o-')[0]
267
249
 
292
274
 
293
275
    def make_parent_and_local_branches(self):
294
276
        # Create a 'parent' branch as the base
295
 
        self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
 
277
        self.parent_tree = ControlDir.create_standalone_workingtree('parent')
296
278
        self.build_tree_contents([('parent/file', 'parent')])
297
279
        self.parent_tree.add('file')
298
280
        self.parent_tree.commit('first commit', rev_id='parent')
311
293
    _default_additional_warning = 'Uncommitted changes will not be sent.'
312
294
 
313
295
    def set_config_send_strict(self, value):
314
 
        # set config var (any of bazaar.conf, locations.conf, branch.conf
315
 
        # should do)
316
 
        conf = self.local_tree.branch.get_config()
317
 
        conf.set_user_option('send_strict', value)
 
296
        br = branch.Branch.open('local')
 
297
        br.get_config_stack().set('send_strict', value)
318
298
 
319
299
    def assertSendFails(self, args):
320
300
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
328
308
        if revs is None:
329
309
            revs = self._default_sent_revs
330
310
        out, err = self.run_send(args, err_re=err_re)
331
 
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
 
311
        if len(revs) == 1:
 
312
            bundling_revs = 'Bundling %d revision.\n'% len(revs)
 
313
        else:
 
314
            bundling_revs = 'Bundling %d revisions.\n' % len(revs)
332
315
        if with_warning:
333
316
            self.assertContainsRe(err, self._default_additional_warning)
334
317
            self.assertEndsWith(err, bundling_revs)
347
330
        super(TestSendStrictWithoutChanges, self).setUp()
348
331
        self.make_parent_and_local_branches()
349
332
 
 
333
    def test_send_without_workingtree(self):
 
334
        ControlDir.open("local").destroy_workingtree()
 
335
        self.assertSendSucceeds([])
 
336
 
350
337
    def test_send_default(self):
351
338
        self.assertSendSucceeds([])
352
339
 
366
353
 
367
354
 
368
355
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
369
 
                                   TestSendStrictMixin):
 
356
                                TestSendStrictMixin):
 
357
 
 
358
    # These are textually the same as test_push.strict_push_change_scenarios,
 
359
    # but since the functions are reimplemented here, the definitions are left
 
360
    # here too.
 
361
    scenarios = [
 
362
        ('uncommitted',
 
363
         dict(_changes_type='_uncommitted_changes')),
 
364
        ('pending_merges',
 
365
         dict(_changes_type='_pending_merges')),
 
366
        ('out-of-sync-trees',
 
367
         dict(_changes_type='_out_of_sync_trees')),
 
368
        ]
370
369
 
371
370
    _changes_type = None # Set by load_tests
372
371
 
441
440
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
442
441
 
443
442
    _default_command = ['bundle-revisions', '../parent']
 
443
 
 
444
 
 
445
class TestSmartServerSend(tests.TestCaseWithTransport):
 
446
 
 
447
    def test_send(self):
 
448
        self.setup_smart_server_with_call_log()
 
449
        t = self.make_branch_and_tree('branch')
 
450
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
451
        t.add("foo")
 
452
        t.commit("message")
 
453
        local = t.bzrdir.sprout('local-branch').open_workingtree()
 
454
        self.build_tree_contents([('branch/foo', 'thenewcontents')])
 
455
        local.commit("anothermessage")
 
456
        self.reset_smart_call_log()
 
457
        out, err = self.run_bzr(
 
458
            ['send', '-o', 'x.diff', self.get_url('branch')], working_dir='local-branch')
 
459
        # This figure represent the amount of work to perform this use case. It
 
460
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
461
        # being too low. If rpc_count increases, more network roundtrips have
 
462
        # become necessary for this use case. Please do not adjust this number
 
463
        # upwards without agreement from bzr's network support maintainers.
 
464
        self.assertLength(7, self.hpss_calls)
 
465
        self.assertLength(1, self.hpss_connections)
 
466
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)