/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: 2018-02-18 21:42:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6859.
  • Revision ID: jelmer@jelmer.uk-20180218214257-jpevutp1wa30tz3v
Update TODO to reference Breezy, not Bazaar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_send.py
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
 
from io import (
19
 
    BytesIO,
20
 
    )
21
18
 
22
19
from ... import (
23
20
    branch,
25
22
    tests,
26
23
    )
27
24
from ...controldir import ControlDir
28
 
from ...bzr.bundle import serializer
 
25
from ...bundle import serializer
 
26
from ...sixish import (
 
27
    BytesIO,
 
28
    )
29
29
from ...transport import memory
30
30
from .. import (
31
31
    scenarios,
32
32
    )
 
33
from ..matchers import ContainsNoVfsCalls
33
34
 
34
35
 
35
36
load_tests = scenarios.load_tests_apply_scenarios
41
42
    _default_wd = 'branch'
42
43
 
43
44
    def run_send(self, args, cmd=None, rc=0, wd=None, err_re=None):
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 = []
 
45
        if cmd is None: cmd = self._default_command
 
46
        if wd is None: wd = self._default_wd
 
47
        if err_re is None: err_re = []
50
48
        return self.run_bzr(cmd + args, retcode=rc,
51
49
                            working_dir=wd,
52
50
                            error_regexes=err_re)
53
51
 
54
52
    def get_MD(self, args, cmd=None, wd='branch'):
55
 
        md = self.run_send(args, cmd=cmd, wd=wd)[0]
56
 
        out = BytesIO(md.encode('utf-8'))
 
53
        out = BytesIO(self.run_send(args, cmd=cmd, wd=wd)[0])
57
54
        return merge_directive.MergeDirective.from_lines(out)
58
55
 
59
56
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
68
65
        super(TestSend, self).setUp()
69
66
        grandparent_tree = ControlDir.create_standalone_workingtree(
70
67
            'grandparent')
71
 
        self.build_tree_contents([('grandparent/file1', b'grandparent')])
 
68
        self.build_tree_contents([('grandparent/file1', 'grandparent')])
72
69
        grandparent_tree.add('file1')
73
 
        grandparent_tree.commit('initial commit', rev_id=b'rev1')
 
70
        grandparent_tree.commit('initial commit', rev_id='rev1')
74
71
 
75
72
        parent_bzrdir = grandparent_tree.controldir.sprout('parent')
76
73
        parent_tree = parent_bzrdir.open_workingtree()
77
 
        parent_tree.commit('next commit', rev_id=b'rev2')
 
74
        parent_tree.commit('next commit', rev_id='rev2')
78
75
 
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')
 
76
        branch_tree = parent_tree.controldir.sprout('branch').open_workingtree()
 
77
        self.build_tree_contents([('branch/file1', 'branch')])
 
78
        branch_tree.commit('last commit', rev_id='rev3')
83
79
 
84
80
    def assertFormatIs(self, fmt_string, md):
85
81
        self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
90
86
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
91
87
        stdout, stderr = self.run_send([])
92
88
        self.assertEqual(stderr.count('Using saved parent location'), 1)
93
 
        self.assertBundleContains([b'rev3'], [])
 
89
        self.assertBundleContains(['rev3'], [])
94
90
 
95
91
    def test_bundle(self):
96
92
        """Bundle works like send, except -o is not required"""
98
94
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
99
95
        stdout, stderr = self.run_send([], cmd=['bundle'])
100
96
        self.assertEqual(stderr.count('Using saved parent location'), 1)
101
 
        self.assertBundleContains([b'rev3'], [], cmd=['bundle'])
 
97
        self.assertBundleContains(['rev3'], [], cmd=['bundle'])
102
98
 
103
99
    def test_uses_submit(self):
104
100
        """Submit location can be used and set"""
105
 
        self.assertBundleContains([b'rev3'], [])
106
 
        self.assertBundleContains([b'rev3', b'rev2'], ['../grandparent'])
 
101
        self.assertBundleContains(['rev3'], [])
 
102
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
107
103
        # submit location should be auto-remembered
108
 
        self.assertBundleContains([b'rev3', b'rev2'], [])
 
104
        self.assertBundleContains(['rev3', 'rev2'], [])
109
105
 
110
106
        self.run_send(['../parent'])
111
107
        # We still point to ../grandparent
112
 
        self.assertBundleContains([b'rev3', b'rev2'], [])
 
108
        self.assertBundleContains(['rev3', 'rev2'], [])
113
109
        # Remember parent now
114
110
        self.run_send(['../parent', '--remember'])
115
111
        # Now we point to parent
116
 
        self.assertBundleContains([b'rev3'], [])
 
112
        self.assertBundleContains(['rev3'], [])
117
113
 
118
114
        err = self.run_send(['--remember'], rc=3)[1]
119
115
        self.assertContainsRe(err,
120
116
                              '--remember requires a branch to be specified.')
121
117
 
122
118
    def test_revision_branch_interaction(self):
123
 
        self.assertBundleContains([b'rev3', b'rev2'], ['../grandparent'])
124
 
        self.assertBundleContains([b'rev2'], ['../grandparent', '-r-2'])
125
 
        self.assertBundleContains([b'rev3', b'rev2'],
 
119
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
 
120
        self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
 
121
        self.assertBundleContains(['rev3', 'rev2'],
126
122
                                  ['../grandparent', '-r-2..-1'])
127
123
        md = self.get_MD(['-r-2..-1'])
128
 
        self.assertEqual(b'rev2', md.base_revision_id)
129
 
        self.assertEqual(b'rev3', md.revision_id)
 
124
        self.assertEqual('rev2', md.base_revision_id)
 
125
        self.assertEqual('rev3', md.revision_id)
130
126
 
131
127
    def test_output(self):
132
128
        # check output for consistency
133
129
        # win32 stdout converts LF to CRLF,
134
130
        # which would break patch-based bundles
135
 
        self.assertBundleContains([b'rev3'], [])
 
131
        self.assertBundleContains(['rev3'], [])
136
132
 
137
133
    def test_no_common_ancestor(self):
138
134
        foo = self.make_branch_and_tree('foo')
162
158
        self.assertIsNot(None, md.patch)
163
159
 
164
160
        md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
165
 
                          '.'])
 
161
                                  '.'])
166
162
        self.assertIs(None, md.bundle)
167
163
        self.assertIsNot(None, md.patch)
168
164
 
178
174
    def test_from_option(self):
179
175
        self.run_bzr('send', retcode=3)
180
176
        md = self.get_MD(['--from', 'branch'])
181
 
        self.assertEqual(b'rev3', md.revision_id)
 
177
        self.assertEqual('rev3', md.revision_id)
182
178
        md = self.get_MD(['-f', 'branch'])
183
 
        self.assertEqual(b'rev3', md.revision_id)
 
179
        self.assertEqual('rev3', md.revision_id)
184
180
 
185
181
    def test_output_option(self):
186
182
        stdout = self.run_bzr('send -f branch --output file1')[0]
187
183
        self.assertEqual('', stdout)
188
184
        md_file = open('file1', 'rb')
189
185
        self.addCleanup(md_file.close)
190
 
        self.assertContainsRe(md_file.read(), b'rev3')
 
186
        self.assertContainsRe(md_file.read(), 'rev3')
191
187
        stdout = self.run_bzr('send -f branch --output -')[0]
192
188
        self.assertContainsRe(stdout, 'rev3')
193
189
 
200
196
        b.get_config_stack().set('mail_client', 'editor')
201
197
        self.run_bzr_error(
202
198
            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
203
 
             ), 'send -f branch')
 
199
            ), 'send -f branch')
204
200
        b.get_config_stack().set('mail_client', 'bogus')
205
201
        self.run_send([])
206
202
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
216
212
        parent = branch.Branch.open('parent')
217
213
        parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
218
214
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
219
 
                           'send -f branch')
 
215
                'send -f branch')
220
216
 
221
217
    def test_format(self):
222
218
        md = self.get_MD(['--format=4'])
223
219
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
224
 
        self.assertFormatIs(b'# Bazaar revision bundle v4', md)
 
220
        self.assertFormatIs('# Bazaar revision bundle v4', md)
225
221
 
226
222
        md = self.get_MD(['--format=0.9'])
227
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
223
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
228
224
 
229
225
        md = self.get_MD(['--format=0.9'], cmd=['bundle'])
230
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
226
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
231
227
        self.assertIs(merge_directive.MergeDirective, md.__class__)
232
228
 
233
229
        self.run_bzr_error(['Bad value .* for option .format.'],
234
 
                           'send -f branch -o- --format=0.999')[0]
 
230
                            'send -f branch -o- --format=0.999')[0]
235
231
 
236
232
    def test_format_child_option(self):
237
233
        br = branch.Branch.open('parent')
242
238
 
243
239
        conf.set('child_submit_format', '0.9')
244
240
        md = self.get_MD([])
245
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
241
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
246
242
 
247
243
        md = self.get_MD([], cmd=['bundle'])
248
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
244
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
249
245
        self.assertIs(merge_directive.MergeDirective, md.__class__)
250
246
 
251
247
        conf.set('child_submit_format', '0.999')
252
248
        self.run_bzr_error(["No such send format '0.999'"],
253
 
                           'send -f branch -o-')[0]
 
249
                            'send -f branch -o-')[0]
254
250
 
255
251
    def test_message_option(self):
256
252
        self.run_bzr('send', retcode=3)
261
257
 
262
258
    def test_omitted_revision(self):
263
259
        md = self.get_MD(['-r-2..'])
264
 
        self.assertEqual(b'rev2', md.base_revision_id)
265
 
        self.assertEqual(b'rev3', md.revision_id)
 
260
        self.assertEqual('rev2', md.base_revision_id)
 
261
        self.assertEqual('rev3', md.revision_id)
266
262
        md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
267
 
        self.assertEqual(b'rev1', md.base_revision_id)
268
 
        self.assertEqual(b'rev3', md.revision_id)
 
263
        self.assertEqual('rev1', md.base_revision_id)
 
264
        self.assertEqual('rev3', md.revision_id)
269
265
 
270
266
    def test_nonexistant_branch(self):
271
267
        self.vfs_transport_factory = memory.MemoryServer
280
276
    def make_parent_and_local_branches(self):
281
277
        # Create a 'parent' branch as the base
282
278
        self.parent_tree = ControlDir.create_standalone_workingtree('parent')
283
 
        self.build_tree_contents([('parent/file', b'parent')])
 
279
        self.build_tree_contents([('parent/file', 'parent')])
284
280
        self.parent_tree.add('file')
285
 
        self.parent_tree.commit('first commit', rev_id=b'parent')
 
281
        self.parent_tree.commit('first commit', rev_id='parent')
286
282
        # Branch 'local' from parent and do a change
287
283
        local_bzrdir = self.parent_tree.controldir.sprout('local')
288
284
        self.local_tree = local_bzrdir.open_workingtree()
289
 
        self.build_tree_contents([('local/file', b'local')])
290
 
        self.local_tree.commit('second commit', rev_id=b'local')
 
285
        self.build_tree_contents([('local/file', 'local')])
 
286
        self.local_tree.commit('second commit', rev_id='local')
291
287
 
292
288
    _default_command = ['send', '-o-', '../parent']
293
289
    _default_wd = 'local'
294
 
    _default_sent_revs = [b'local']
 
290
    _default_sent_revs = ['local']
295
291
    _default_errors = ['Working tree ".*/local/" has uncommitted '
296
 
                       'changes \\(See brz status\\)\\.', ]
 
292
                       'changes \(See brz status\)\.',]
297
293
    _default_additional_error = 'Use --no-strict to force the send.\n'
298
294
    _default_additional_warning = 'Uncommitted changes will not be sent.'
299
295
 
314
310
            revs = self._default_sent_revs
315
311
        out, err = self.run_send(args, err_re=err_re)
316
312
        if len(revs) == 1:
317
 
            bundling_revs = 'Bundling %d revision.\n' % len(revs)
 
313
            bundling_revs = 'Bundling %d revision.\n'% len(revs)
318
314
        else:
319
315
            bundling_revs = 'Bundling %d revisions.\n' % len(revs)
320
316
        if with_warning:
322
318
            self.assertEndsWith(err, bundling_revs)
323
319
        else:
324
320
            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)
 
321
        md = merge_directive.MergeDirective.from_lines(BytesIO(out))
 
322
        self.assertEqual('parent', md.base_revision_id)
328
323
        br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
329
324
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
330
325
 
373
368
         dict(_changes_type='_out_of_sync_trees')),
374
369
        ]
375
370
 
376
 
    _changes_type = None  # Set by load_tests
 
371
    _changes_type = None # Set by load_tests
377
372
 
378
373
    def setUp(self):
379
374
        super(TestSendStrictWithChanges, self).setUp()
385
380
    def _uncommitted_changes(self):
386
381
        self.make_parent_and_local_branches()
387
382
        # Make a change without committing it
388
 
        self.build_tree_contents([('local/file', b'modified')])
 
383
        self.build_tree_contents([('local/file', 'modified')])
389
384
 
390
385
    def _pending_merges(self):
391
386
        self.make_parent_and_local_branches()
392
387
        # Create 'other' branch containing a new file
393
388
        other_bzrdir = self.parent_tree.controldir.sprout('other')
394
389
        other_tree = other_bzrdir.open_workingtree()
395
 
        self.build_tree_contents([('other/other-file', b'other')])
 
390
        self.build_tree_contents([('other/other-file', 'other')])
396
391
        other_tree.add('other-file')
397
 
        other_tree.commit('other commit', rev_id=b'other')
 
392
        other_tree.commit('other commit', rev_id='other')
398
393
        # Merge and revert, leaving a pending merge
399
394
        self.local_tree.merge_from_branch(other_tree.branch)
400
395
        self.local_tree.revert(filenames=['other-file'], backups=False)
403
398
        self.make_parent_and_local_branches()
404
399
        self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
405
400
        # Make a change and commit it
406
 
        self.build_tree_contents([('local/file', b'modified in local')])
407
 
        self.local_tree.commit('modify file', rev_id=b'modified-in-local')
 
401
        self.build_tree_contents([('local/file', 'modified in local')])
 
402
        self.local_tree.commit('modify file', rev_id='modified-in-local')
408
403
        # Exercise commands from the checkout directory
409
404
        self._default_wd = 'checkout'
410
405
        self._default_errors = ["Working tree is out of date, please run"
411
 
                                " 'brz update'\\.", ]
412
 
        self._default_sent_revs = [b'modified-in-local', b'local']
 
406
                                " 'brz update'\.",]
 
407
        self._default_sent_revs = ['modified-in-local', 'local']
413
408
 
414
409
    def test_send_default(self):
415
410
        self.assertSendSucceeds([], with_warning=True)
416
411
 
417
412
    def test_send_with_revision(self):
418
 
        self.assertSendSucceeds(['-r', 'revid:local'], revs=[b'local'])
 
413
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
419
414
 
420
415
    def test_send_no_strict(self):
421
416
        self.assertSendSucceeds(['--no-strict'])
447
442
 
448
443
    _default_command = ['bundle-revisions', '../parent']
449
444
 
 
445
 
 
446
class TestSmartServerSend(tests.TestCaseWithTransport):
 
447
 
 
448
    def test_send(self):
 
449
        self.setup_smart_server_with_call_log()
 
450
        t = self.make_branch_and_tree('branch')
 
451
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
452
        t.add("foo")
 
453
        t.commit("message")
 
454
        local = t.controldir.sprout('local-branch').open_workingtree()
 
455
        self.build_tree_contents([('branch/foo', 'thenewcontents')])
 
456
        local.commit("anothermessage")
 
457
        self.reset_smart_call_log()
 
458
        out, err = self.run_bzr(
 
459
            ['send', '-o', 'x.diff', self.get_url('branch')], working_dir='local-branch')
 
460
        # This figure represent the amount of work to perform this use case. It
 
461
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
462
        # being too low. If rpc_count increases, more network roundtrips have
 
463
        # become necessary for this use case. Please do not adjust this number
 
464
        # upwards without agreement from bzr's network support maintainers.
 
465
        self.assertLength(7, self.hpss_calls)
 
466
        self.assertLength(1, self.hpss_connections)
 
467
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)