/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/blackbox/test_send.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-09-15 00:32:05 UTC
  • mfrom: (7096.3.9 per-tree-git-revtree)
  • Revision ID: breezy.the.bot@gmail.com-20180915003205-dmcqqujf6z368wgf
Run per_tree tests against GitRevisionTree.

Merged from https://code.launchpad.net/~jelmer/brz/per-tree-git-revtree/+merge/354530

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_send.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 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
 
from cStringIO import StringIO
21
 
 
22
 
from bzrlib import (
 
19
from ... import (
23
20
    branch,
24
 
    bzrdir,
25
21
    merge_directive,
26
22
    tests,
27
23
    )
28
 
from bzrlib.bundle import serializer
29
 
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
 
24
from ...controldir import ControlDir
 
25
from ...bundle import serializer
 
26
from ...sixish import (
 
27
    BytesIO,
 
28
    )
 
29
from ...transport import memory
 
30
from .. import (
 
31
    scenarios,
 
32
    )
 
33
from ..matchers import ContainsNoVfsCalls
 
34
 
 
35
 
 
36
load_tests = scenarios.load_tests_apply_scenarios
54
37
 
55
38
 
56
39
class TestSendMixin(object):
67
50
                            error_regexes=err_re)
68
51
 
69
52
    def get_MD(self, args, cmd=None, wd='branch'):
70
 
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
 
53
        md = self.run_send(args, cmd=cmd, wd=wd)[0]
 
54
        out = BytesIO(md.encode('utf-8'))
71
55
        return merge_directive.MergeDirective.from_lines(out)
72
56
 
73
57
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
74
58
        md = self.get_MD(args, cmd=cmd, wd=wd)
75
 
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
 
59
        br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
76
60
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
77
61
 
78
62
 
80
64
 
81
65
    def setUp(self):
82
66
        super(TestSend, self).setUp()
83
 
        grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
 
67
        grandparent_tree = ControlDir.create_standalone_workingtree(
84
68
            'grandparent')
85
 
        self.build_tree_contents([('grandparent/file1', 'grandparent')])
 
69
        self.build_tree_contents([('grandparent/file1', b'grandparent')])
86
70
        grandparent_tree.add('file1')
87
 
        grandparent_tree.commit('initial commit', rev_id='rev1')
 
71
        grandparent_tree.commit('initial commit', rev_id=b'rev1')
88
72
 
89
 
        parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
 
73
        parent_bzrdir = grandparent_tree.controldir.sprout('parent')
90
74
        parent_tree = parent_bzrdir.open_workingtree()
91
 
        parent_tree.commit('next commit', rev_id='rev2')
 
75
        parent_tree.commit('next commit', rev_id=b'rev2')
92
76
 
93
 
        branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
94
 
        self.build_tree_contents([('branch/file1', 'branch')])
95
 
        branch_tree.commit('last commit', rev_id='rev3')
 
77
        branch_tree = parent_tree.controldir.sprout('branch').open_workingtree()
 
78
        self.build_tree_contents([('branch/file1', b'branch')])
 
79
        branch_tree.commit('last commit', rev_id=b'rev3')
96
80
 
97
81
    def assertFormatIs(self, fmt_string, md):
98
82
        self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
103
87
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
104
88
        stdout, stderr = self.run_send([])
105
89
        self.assertEqual(stderr.count('Using saved parent location'), 1)
106
 
        self.assertBundleContains(['rev3'], [])
 
90
        self.assertBundleContains([b'rev3'], [])
107
91
 
108
92
    def test_bundle(self):
109
93
        """Bundle works like send, except -o is not required"""
111
95
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
112
96
        stdout, stderr = self.run_send([], cmd=['bundle'])
113
97
        self.assertEqual(stderr.count('Using saved parent location'), 1)
114
 
        self.assertBundleContains(['rev3'], [], cmd=['bundle'])
 
98
        self.assertBundleContains([b'rev3'], [], cmd=['bundle'])
115
99
 
116
100
    def test_uses_submit(self):
117
101
        """Submit location can be used and set"""
118
 
        self.assertBundleContains(['rev3'], [])
119
 
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
 
102
        self.assertBundleContains([b'rev3'], [])
 
103
        self.assertBundleContains([b'rev3', b'rev2'], ['../grandparent'])
120
104
        # submit location should be auto-remembered
121
 
        self.assertBundleContains(['rev3', 'rev2'], [])
 
105
        self.assertBundleContains([b'rev3', b'rev2'], [])
122
106
 
123
107
        self.run_send(['../parent'])
124
108
        # We still point to ../grandparent
125
 
        self.assertBundleContains(['rev3', 'rev2'], [])
 
109
        self.assertBundleContains([b'rev3', b'rev2'], [])
126
110
        # Remember parent now
127
111
        self.run_send(['../parent', '--remember'])
128
112
        # Now we point to parent
129
 
        self.assertBundleContains(['rev3'], [])
 
113
        self.assertBundleContains([b'rev3'], [])
130
114
 
131
115
        err = self.run_send(['--remember'], rc=3)[1]
132
116
        self.assertContainsRe(err,
133
117
                              '--remember requires a branch to be specified.')
134
118
 
135
119
    def test_revision_branch_interaction(self):
136
 
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
137
 
        self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
138
 
        self.assertBundleContains(['rev3', 'rev2'],
 
120
        self.assertBundleContains([b'rev3', b'rev2'], ['../grandparent'])
 
121
        self.assertBundleContains([b'rev2'], ['../grandparent', '-r-2'])
 
122
        self.assertBundleContains([b'rev3', b'rev2'],
139
123
                                  ['../grandparent', '-r-2..-1'])
140
124
        md = self.get_MD(['-r-2..-1'])
141
 
        self.assertEqual('rev2', md.base_revision_id)
142
 
        self.assertEqual('rev3', md.revision_id)
 
125
        self.assertEqual(b'rev2', md.base_revision_id)
 
126
        self.assertEqual(b'rev3', md.revision_id)
143
127
 
144
128
    def test_output(self):
145
129
        # check output for consistency
146
130
        # win32 stdout converts LF to CRLF,
147
131
        # which would break patch-based bundles
148
 
        self.assertBundleContains(['rev3'], [])
 
132
        self.assertBundleContains([b'rev3'], [])
149
133
 
150
134
    def test_no_common_ancestor(self):
151
135
        foo = self.make_branch_and_tree('foo')
191
175
    def test_from_option(self):
192
176
        self.run_bzr('send', retcode=3)
193
177
        md = self.get_MD(['--from', 'branch'])
194
 
        self.assertEqual('rev3', md.revision_id)
 
178
        self.assertEqual(b'rev3', md.revision_id)
195
179
        md = self.get_MD(['-f', 'branch'])
196
 
        self.assertEqual('rev3', md.revision_id)
 
180
        self.assertEqual(b'rev3', md.revision_id)
197
181
 
198
182
    def test_output_option(self):
199
183
        stdout = self.run_bzr('send -f branch --output file1')[0]
200
184
        self.assertEqual('', stdout)
201
185
        md_file = open('file1', 'rb')
202
186
        self.addCleanup(md_file.close)
203
 
        self.assertContainsRe(md_file.read(), 'rev3')
 
187
        self.assertContainsRe(md_file.read(), b'rev3')
204
188
        stdout = self.run_bzr('send -f branch --output -')[0]
205
189
        self.assertContainsRe(stdout, 'rev3')
206
190
 
207
191
    def test_note_revisions(self):
208
192
        stderr = self.run_send([])[1]
209
 
        self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
 
193
        self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
210
194
 
211
195
    def test_mailto_option(self):
212
196
        b = branch.Branch.open('branch')
213
 
        b.get_config().set_user_option('mail_client', 'editor')
 
197
        b.get_config_stack().set('mail_client', 'editor')
214
198
        self.run_bzr_error(
215
199
            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
216
200
            ), 'send -f branch')
217
 
        b.get_config().set_user_option('mail_client', 'bogus')
 
201
        b.get_config_stack().set('mail_client', 'bogus')
218
202
        self.run_send([])
219
 
        self.run_bzr_error(('Unknown mail client: bogus',),
 
203
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
220
204
                           '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',),
 
205
        b.get_config_stack().set('submit_to', 'jrandom@example.org')
 
206
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
223
207
                           'send -f branch')
224
208
 
225
209
    def test_mailto_child_option(self):
226
210
        """Make sure that child_submit_to is used."""
227
211
        b = branch.Branch.open('branch')
228
 
        b.get_config().set_user_option('mail_client', 'bogus')
 
212
        b.get_config_stack().set('mail_client', 'bogus')
229
213
        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')
 
214
        parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
 
215
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
 
216
                'send -f branch')
234
217
 
235
218
    def test_format(self):
236
219
        md = self.get_MD(['--format=4'])
237
220
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
238
 
        self.assertFormatIs('# Bazaar revision bundle v4', md)
 
221
        self.assertFormatIs(b'# Bazaar revision bundle v4', md)
239
222
 
240
223
        md = self.get_MD(['--format=0.9'])
241
 
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
 
224
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
242
225
 
243
226
        md = self.get_MD(['--format=0.9'], cmd=['bundle'])
244
 
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
 
227
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
245
228
        self.assertIs(merge_directive.MergeDirective, md.__class__)
246
229
 
247
230
        self.run_bzr_error(['Bad value .* for option .format.'],
248
231
                            'send -f branch -o- --format=0.999')[0]
249
232
 
250
233
    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')
 
234
        br = branch.Branch.open('parent')
 
235
        conf = br.get_config_stack()
 
236
        conf.set('child_submit_format', '4')
253
237
        md = self.get_MD([])
254
238
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
255
239
 
256
 
        parent_config.set_user_option('child_submit_format', '0.9')
 
240
        conf.set('child_submit_format', '0.9')
257
241
        md = self.get_MD([])
258
 
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
 
242
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
259
243
 
260
244
        md = self.get_MD([], cmd=['bundle'])
261
 
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
 
245
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
262
246
        self.assertIs(merge_directive.MergeDirective, md.__class__)
263
247
 
264
 
        parent_config.set_user_option('child_submit_format', '0.999')
 
248
        conf.set('child_submit_format', '0.999')
265
249
        self.run_bzr_error(["No such send format '0.999'"],
266
250
                            'send -f branch -o-')[0]
267
251
 
274
258
 
275
259
    def test_omitted_revision(self):
276
260
        md = self.get_MD(['-r-2..'])
277
 
        self.assertEqual('rev2', md.base_revision_id)
278
 
        self.assertEqual('rev3', md.revision_id)
 
261
        self.assertEqual(b'rev2', md.base_revision_id)
 
262
        self.assertEqual(b'rev3', md.revision_id)
279
263
        md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
280
 
        self.assertEqual('rev1', md.base_revision_id)
281
 
        self.assertEqual('rev3', md.revision_id)
 
264
        self.assertEqual(b'rev1', md.base_revision_id)
 
265
        self.assertEqual(b'rev3', md.revision_id)
282
266
 
283
267
    def test_nonexistant_branch(self):
284
268
        self.vfs_transport_factory = memory.MemoryServer
285
269
        location = self.get_url('absentdir/')
286
270
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
287
271
        self.assertEqual(out, '')
288
 
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
 
272
        self.assertEqual(err, 'brz: ERROR: Not a branch: "%s".\n' % location)
289
273
 
290
274
 
291
275
class TestSendStrictMixin(TestSendMixin):
292
276
 
293
277
    def make_parent_and_local_branches(self):
294
278
        # Create a 'parent' branch as the base
295
 
        self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
296
 
        self.build_tree_contents([('parent/file', 'parent')])
 
279
        self.parent_tree = ControlDir.create_standalone_workingtree('parent')
 
280
        self.build_tree_contents([('parent/file', b'parent')])
297
281
        self.parent_tree.add('file')
298
 
        self.parent_tree.commit('first commit', rev_id='parent')
 
282
        self.parent_tree.commit('first commit', rev_id=b'parent')
299
283
        # Branch 'local' from parent and do a change
300
 
        local_bzrdir = self.parent_tree.bzrdir.sprout('local')
 
284
        local_bzrdir = self.parent_tree.controldir.sprout('local')
301
285
        self.local_tree = local_bzrdir.open_workingtree()
302
 
        self.build_tree_contents([('local/file', 'local')])
303
 
        self.local_tree.commit('second commit', rev_id='local')
 
286
        self.build_tree_contents([('local/file', b'local')])
 
287
        self.local_tree.commit('second commit', rev_id=b'local')
304
288
 
305
289
    _default_command = ['send', '-o-', '../parent']
306
290
    _default_wd = 'local'
307
 
    _default_sent_revs = ['local']
 
291
    _default_sent_revs = [b'local']
308
292
    _default_errors = ['Working tree ".*/local/" has uncommitted '
309
 
                       'changes \(See bzr status\)\.',]
 
293
                       'changes \\(See brz status\\)\\.',]
310
294
    _default_additional_error = 'Use --no-strict to force the send.\n'
311
295
    _default_additional_warning = 'Uncommitted changes will not be sent.'
312
296
 
313
297
    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)
 
298
        br = branch.Branch.open('local')
 
299
        br.get_config_stack().set('send_strict', value)
318
300
 
319
301
    def assertSendFails(self, args):
320
302
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
328
310
        if revs is None:
329
311
            revs = self._default_sent_revs
330
312
        out, err = self.run_send(args, err_re=err_re)
331
 
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
 
313
        if len(revs) == 1:
 
314
            bundling_revs = 'Bundling %d revision.\n'% len(revs)
 
315
        else:
 
316
            bundling_revs = 'Bundling %d revisions.\n' % len(revs)
332
317
        if with_warning:
333
318
            self.assertContainsRe(err, self._default_additional_warning)
334
319
            self.assertEndsWith(err, bundling_revs)
335
320
        else:
336
 
            self.assertEquals(bundling_revs, err)
337
 
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
338
 
        self.assertEqual('parent', md.base_revision_id)
339
 
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
 
321
            self.assertEqual(bundling_revs, err)
 
322
        md = merge_directive.MergeDirective.from_lines(BytesIO(out.encode('utf-8')))
 
323
        self.assertEqual(b'parent', md.base_revision_id)
 
324
        br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
340
325
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
341
326
 
342
327
 
347
332
        super(TestSendStrictWithoutChanges, self).setUp()
348
333
        self.make_parent_and_local_branches()
349
334
 
 
335
    def test_send_without_workingtree(self):
 
336
        ControlDir.open("local").destroy_workingtree()
 
337
        self.assertSendSucceeds([])
 
338
 
350
339
    def test_send_default(self):
351
340
        self.assertSendSucceeds([])
352
341
 
366
355
 
367
356
 
368
357
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
369
 
                                   TestSendStrictMixin):
 
358
                                TestSendStrictMixin):
 
359
 
 
360
    # These are textually the same as test_push.strict_push_change_scenarios,
 
361
    # but since the functions are reimplemented here, the definitions are left
 
362
    # here too.
 
363
    scenarios = [
 
364
        ('uncommitted',
 
365
         dict(_changes_type='_uncommitted_changes')),
 
366
        ('pending_merges',
 
367
         dict(_changes_type='_pending_merges')),
 
368
        ('out-of-sync-trees',
 
369
         dict(_changes_type='_out_of_sync_trees')),
 
370
        ]
370
371
 
371
372
    _changes_type = None # Set by load_tests
372
373
 
380
381
    def _uncommitted_changes(self):
381
382
        self.make_parent_and_local_branches()
382
383
        # Make a change without committing it
383
 
        self.build_tree_contents([('local/file', 'modified')])
 
384
        self.build_tree_contents([('local/file', b'modified')])
384
385
 
385
386
    def _pending_merges(self):
386
387
        self.make_parent_and_local_branches()
387
388
        # Create 'other' branch containing a new file
388
 
        other_bzrdir = self.parent_tree.bzrdir.sprout('other')
 
389
        other_bzrdir = self.parent_tree.controldir.sprout('other')
389
390
        other_tree = other_bzrdir.open_workingtree()
390
 
        self.build_tree_contents([('other/other-file', 'other')])
 
391
        self.build_tree_contents([('other/other-file', b'other')])
391
392
        other_tree.add('other-file')
392
 
        other_tree.commit('other commit', rev_id='other')
 
393
        other_tree.commit('other commit', rev_id=b'other')
393
394
        # Merge and revert, leaving a pending merge
394
395
        self.local_tree.merge_from_branch(other_tree.branch)
395
396
        self.local_tree.revert(filenames=['other-file'], backups=False)
398
399
        self.make_parent_and_local_branches()
399
400
        self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
400
401
        # Make a change and commit it
401
 
        self.build_tree_contents([('local/file', 'modified in local')])
402
 
        self.local_tree.commit('modify file', rev_id='modified-in-local')
 
402
        self.build_tree_contents([('local/file', b'modified in local')])
 
403
        self.local_tree.commit('modify file', rev_id=b'modified-in-local')
403
404
        # Exercise commands from the checkout directory
404
405
        self._default_wd = 'checkout'
405
406
        self._default_errors = ["Working tree is out of date, please run"
406
 
                                " 'bzr update'\.",]
407
 
        self._default_sent_revs = ['modified-in-local', 'local']
 
407
                                " 'brz update'\\.",]
 
408
        self._default_sent_revs = [b'modified-in-local', b'local']
408
409
 
409
410
    def test_send_default(self):
410
411
        self.assertSendSucceeds([], with_warning=True)
411
412
 
412
413
    def test_send_with_revision(self):
413
 
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
 
414
        self.assertSendSucceeds(['-r', 'revid:local'], revs=[b'local'])
414
415
 
415
416
    def test_send_no_strict(self):
416
417
        self.assertSendSucceeds(['--no-strict'])
441
442
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
442
443
 
443
444
    _default_command = ['bundle-revisions', '../parent']
 
445
 
 
446
 
 
447
class TestSmartServerSend(tests.TestCaseWithTransport):
 
448
 
 
449
    def test_send(self):
 
450
        self.setup_smart_server_with_call_log()
 
451
        t = self.make_branch_and_tree('branch')
 
452
        self.build_tree_contents([('branch/foo', b'thecontents')])
 
453
        t.add("foo")
 
454
        t.commit("message")
 
455
        local = t.controldir.sprout('local-branch').open_workingtree()
 
456
        self.build_tree_contents([('branch/foo', b'thenewcontents')])
 
457
        local.commit("anothermessage")
 
458
        self.reset_smart_call_log()
 
459
        out, err = self.run_bzr(
 
460
            ['send', '-o', 'x.diff', self.get_url('branch')], working_dir='local-branch')
 
461
        # This figure represent the amount of work to perform this use case. It
 
462
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
463
        # being too low. If rpc_count increases, more network roundtrips have
 
464
        # become necessary for this use case. Please do not adjust this number
 
465
        # upwards without agreement from bzr's network support maintainers.
 
466
        self.assertLength(7, self.hpss_calls)
 
467
        self.assertLength(1, self.hpss_connections)
 
468
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)