/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-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_send.py
22
22
    tests,
23
23
    )
24
24
from ...controldir import ControlDir
25
 
from ...bzr.bundle import serializer
 
25
from ...bundle import serializer
26
26
from ...sixish import (
27
27
    BytesIO,
28
28
    )
42
42
    _default_wd = 'branch'
43
43
 
44
44
    def run_send(self, args, cmd=None, rc=0, wd=None, err_re=None):
45
 
        if cmd is None:
46
 
            cmd = self._default_command
47
 
        if wd is None:
48
 
            wd = self._default_wd
49
 
        if err_re is None:
50
 
            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 = []
51
48
        return self.run_bzr(cmd + args, retcode=rc,
52
49
                            working_dir=wd,
53
50
                            error_regexes=err_re)
54
51
 
55
52
    def get_MD(self, args, cmd=None, wd='branch'):
56
 
        md = self.run_send(args, cmd=cmd, wd=wd)[0]
57
 
        out = BytesIO(md.encode('utf-8'))
 
53
        out = BytesIO(self.run_send(args, cmd=cmd, wd=wd)[0])
58
54
        return merge_directive.MergeDirective.from_lines(out)
59
55
 
60
56
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
77
73
        parent_tree = parent_bzrdir.open_workingtree()
78
74
        parent_tree.commit('next commit', rev_id=b'rev2')
79
75
 
80
 
        branch_tree = parent_tree.controldir.sprout(
81
 
            'branch').open_workingtree()
 
76
        branch_tree = parent_tree.controldir.sprout('branch').open_workingtree()
82
77
        self.build_tree_contents([('branch/file1', b'branch')])
83
78
        branch_tree.commit('last commit', rev_id=b'rev3')
84
79
 
91
86
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
92
87
        stdout, stderr = self.run_send([])
93
88
        self.assertEqual(stderr.count('Using saved parent location'), 1)
94
 
        self.assertBundleContains([b'rev3'], [])
 
89
        self.assertBundleContains(['rev3'], [])
95
90
 
96
91
    def test_bundle(self):
97
92
        """Bundle works like send, except -o is not required"""
99
94
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
100
95
        stdout, stderr = self.run_send([], cmd=['bundle'])
101
96
        self.assertEqual(stderr.count('Using saved parent location'), 1)
102
 
        self.assertBundleContains([b'rev3'], [], cmd=['bundle'])
 
97
        self.assertBundleContains(['rev3'], [], cmd=['bundle'])
103
98
 
104
99
    def test_uses_submit(self):
105
100
        """Submit location can be used and set"""
106
 
        self.assertBundleContains([b'rev3'], [])
107
 
        self.assertBundleContains([b'rev3', b'rev2'], ['../grandparent'])
 
101
        self.assertBundleContains(['rev3'], [])
 
102
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
108
103
        # submit location should be auto-remembered
109
 
        self.assertBundleContains([b'rev3', b'rev2'], [])
 
104
        self.assertBundleContains(['rev3', 'rev2'], [])
110
105
 
111
106
        self.run_send(['../parent'])
112
107
        # We still point to ../grandparent
113
 
        self.assertBundleContains([b'rev3', b'rev2'], [])
 
108
        self.assertBundleContains(['rev3', 'rev2'], [])
114
109
        # Remember parent now
115
110
        self.run_send(['../parent', '--remember'])
116
111
        # Now we point to parent
117
 
        self.assertBundleContains([b'rev3'], [])
 
112
        self.assertBundleContains(['rev3'], [])
118
113
 
119
114
        err = self.run_send(['--remember'], rc=3)[1]
120
115
        self.assertContainsRe(err,
121
116
                              '--remember requires a branch to be specified.')
122
117
 
123
118
    def test_revision_branch_interaction(self):
124
 
        self.assertBundleContains([b'rev3', b'rev2'], ['../grandparent'])
125
 
        self.assertBundleContains([b'rev2'], ['../grandparent', '-r-2'])
126
 
        self.assertBundleContains([b'rev3', b'rev2'],
 
119
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
 
120
        self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
 
121
        self.assertBundleContains(['rev3', 'rev2'],
127
122
                                  ['../grandparent', '-r-2..-1'])
128
123
        md = self.get_MD(['-r-2..-1'])
129
 
        self.assertEqual(b'rev2', md.base_revision_id)
130
 
        self.assertEqual(b'rev3', md.revision_id)
 
124
        self.assertEqual('rev2', md.base_revision_id)
 
125
        self.assertEqual('rev3', md.revision_id)
131
126
 
132
127
    def test_output(self):
133
128
        # check output for consistency
134
129
        # win32 stdout converts LF to CRLF,
135
130
        # which would break patch-based bundles
136
 
        self.assertBundleContains([b'rev3'], [])
 
131
        self.assertBundleContains(['rev3'], [])
137
132
 
138
133
    def test_no_common_ancestor(self):
139
134
        foo = self.make_branch_and_tree('foo')
163
158
        self.assertIsNot(None, md.patch)
164
159
 
165
160
        md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
166
 
                          '.'])
 
161
                                  '.'])
167
162
        self.assertIs(None, md.bundle)
168
163
        self.assertIsNot(None, md.patch)
169
164
 
179
174
    def test_from_option(self):
180
175
        self.run_bzr('send', retcode=3)
181
176
        md = self.get_MD(['--from', 'branch'])
182
 
        self.assertEqual(b'rev3', md.revision_id)
 
177
        self.assertEqual('rev3', md.revision_id)
183
178
        md = self.get_MD(['-f', 'branch'])
184
 
        self.assertEqual(b'rev3', md.revision_id)
 
179
        self.assertEqual('rev3', md.revision_id)
185
180
 
186
181
    def test_output_option(self):
187
182
        stdout = self.run_bzr('send -f branch --output file1')[0]
188
183
        self.assertEqual('', stdout)
189
184
        md_file = open('file1', 'rb')
190
185
        self.addCleanup(md_file.close)
191
 
        self.assertContainsRe(md_file.read(), b'rev3')
 
186
        self.assertContainsRe(md_file.read(), 'rev3')
192
187
        stdout = self.run_bzr('send -f branch --output -')[0]
193
188
        self.assertContainsRe(stdout, 'rev3')
194
189
 
201
196
        b.get_config_stack().set('mail_client', 'editor')
202
197
        self.run_bzr_error(
203
198
            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
204
 
             ), 'send -f branch')
 
199
            ), 'send -f branch')
205
200
        b.get_config_stack().set('mail_client', 'bogus')
206
201
        self.run_send([])
207
202
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
217
212
        parent = branch.Branch.open('parent')
218
213
        parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
219
214
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
220
 
                           'send -f branch')
 
215
                'send -f branch')
221
216
 
222
217
    def test_format(self):
223
218
        md = self.get_MD(['--format=4'])
224
219
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
225
 
        self.assertFormatIs(b'# Bazaar revision bundle v4', md)
 
220
        self.assertFormatIs('# Bazaar revision bundle v4', md)
226
221
 
227
222
        md = self.get_MD(['--format=0.9'])
228
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
223
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
229
224
 
230
225
        md = self.get_MD(['--format=0.9'], cmd=['bundle'])
231
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
226
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
232
227
        self.assertIs(merge_directive.MergeDirective, md.__class__)
233
228
 
234
229
        self.run_bzr_error(['Bad value .* for option .format.'],
235
 
                           'send -f branch -o- --format=0.999')[0]
 
230
                            'send -f branch -o- --format=0.999')[0]
236
231
 
237
232
    def test_format_child_option(self):
238
233
        br = branch.Branch.open('parent')
243
238
 
244
239
        conf.set('child_submit_format', '0.9')
245
240
        md = self.get_MD([])
246
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
241
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
247
242
 
248
243
        md = self.get_MD([], cmd=['bundle'])
249
 
        self.assertFormatIs(b'# Bazaar revision bundle v0.9', md)
 
244
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
250
245
        self.assertIs(merge_directive.MergeDirective, md.__class__)
251
246
 
252
247
        conf.set('child_submit_format', '0.999')
253
248
        self.run_bzr_error(["No such send format '0.999'"],
254
 
                           'send -f branch -o-')[0]
 
249
                            'send -f branch -o-')[0]
255
250
 
256
251
    def test_message_option(self):
257
252
        self.run_bzr('send', retcode=3)
262
257
 
263
258
    def test_omitted_revision(self):
264
259
        md = self.get_MD(['-r-2..'])
265
 
        self.assertEqual(b'rev2', md.base_revision_id)
266
 
        self.assertEqual(b'rev3', md.revision_id)
 
260
        self.assertEqual('rev2', md.base_revision_id)
 
261
        self.assertEqual('rev3', md.revision_id)
267
262
        md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
268
 
        self.assertEqual(b'rev1', md.base_revision_id)
269
 
        self.assertEqual(b'rev3', md.revision_id)
 
263
        self.assertEqual('rev1', md.base_revision_id)
 
264
        self.assertEqual('rev3', md.revision_id)
270
265
 
271
266
    def test_nonexistant_branch(self):
272
267
        self.vfs_transport_factory = memory.MemoryServer
292
287
 
293
288
    _default_command = ['send', '-o-', '../parent']
294
289
    _default_wd = 'local'
295
 
    _default_sent_revs = [b'local']
 
290
    _default_sent_revs = ['local']
296
291
    _default_errors = ['Working tree ".*/local/" has uncommitted '
297
 
                       'changes \\(See brz status\\)\\.', ]
 
292
                       'changes \(See brz status\)\.',]
298
293
    _default_additional_error = 'Use --no-strict to force the send.\n'
299
294
    _default_additional_warning = 'Uncommitted changes will not be sent.'
300
295
 
315
310
            revs = self._default_sent_revs
316
311
        out, err = self.run_send(args, err_re=err_re)
317
312
        if len(revs) == 1:
318
 
            bundling_revs = 'Bundling %d revision.\n' % len(revs)
 
313
            bundling_revs = 'Bundling %d revision.\n'% len(revs)
319
314
        else:
320
315
            bundling_revs = 'Bundling %d revisions.\n' % len(revs)
321
316
        if with_warning:
323
318
            self.assertEndsWith(err, bundling_revs)
324
319
        else:
325
320
            self.assertEqual(bundling_revs, err)
326
 
        md = merge_directive.MergeDirective.from_lines(
327
 
            BytesIO(out.encode('utf-8')))
328
 
        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)
329
323
        br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
330
324
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
331
325
 
374
368
         dict(_changes_type='_out_of_sync_trees')),
375
369
        ]
376
370
 
377
 
    _changes_type = None  # Set by load_tests
 
371
    _changes_type = None # Set by load_tests
378
372
 
379
373
    def setUp(self):
380
374
        super(TestSendStrictWithChanges, self).setUp()
409
403
        # Exercise commands from the checkout directory
410
404
        self._default_wd = 'checkout'
411
405
        self._default_errors = ["Working tree is out of date, please run"
412
 
                                " 'brz update'\\.", ]
413
 
        self._default_sent_revs = [b'modified-in-local', b'local']
 
406
                                " 'brz update'\.",]
 
407
        self._default_sent_revs = ['modified-in-local', 'local']
414
408
 
415
409
    def test_send_default(self):
416
410
        self.assertSendSucceeds([], with_warning=True)
417
411
 
418
412
    def test_send_with_revision(self):
419
 
        self.assertSendSucceeds(['-r', 'revid:local'], revs=[b'local'])
 
413
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
420
414
 
421
415
    def test_send_no_strict(self):
422
416
        self.assertSendSucceeds(['--no-strict'])