/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: Jelmer Vernooij
  • Date: 2020-11-19 18:28:52 UTC
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20201119182852-4za22s5mhakix4dq
Remove sixish data type.

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