/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-11-16 23:19:12 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20181116231912-e043vpq22bdkxa6q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_send.py
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: cmd = self._default_command
46
 
        if wd is None: wd = self._default_wd
47
 
        if err_re is None: err_re = []
 
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 = []
48
51
        return self.run_bzr(cmd + args, retcode=rc,
49
52
                            working_dir=wd,
50
53
                            error_regexes=err_re)
74
77
        parent_tree = parent_bzrdir.open_workingtree()
75
78
        parent_tree.commit('next commit', rev_id=b'rev2')
76
79
 
77
 
        branch_tree = parent_tree.controldir.sprout('branch').open_workingtree()
 
80
        branch_tree = parent_tree.controldir.sprout(
 
81
            'branch').open_workingtree()
78
82
        self.build_tree_contents([('branch/file1', b'branch')])
79
83
        branch_tree.commit('last commit', rev_id=b'rev3')
80
84
 
159
163
        self.assertIsNot(None, md.patch)
160
164
 
161
165
        md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
162
 
                                  '.'])
 
166
                          '.'])
163
167
        self.assertIs(None, md.bundle)
164
168
        self.assertIsNot(None, md.patch)
165
169
 
197
201
        b.get_config_stack().set('mail_client', 'editor')
198
202
        self.run_bzr_error(
199
203
            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
200
 
            ), 'send -f branch')
 
204
             ), 'send -f branch')
201
205
        b.get_config_stack().set('mail_client', 'bogus')
202
206
        self.run_send([])
203
207
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
213
217
        parent = branch.Branch.open('parent')
214
218
        parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
215
219
        self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
216
 
                'send -f branch')
 
220
                           'send -f branch')
217
221
 
218
222
    def test_format(self):
219
223
        md = self.get_MD(['--format=4'])
228
232
        self.assertIs(merge_directive.MergeDirective, md.__class__)
229
233
 
230
234
        self.run_bzr_error(['Bad value .* for option .format.'],
231
 
                            'send -f branch -o- --format=0.999')[0]
 
235
                           'send -f branch -o- --format=0.999')[0]
232
236
 
233
237
    def test_format_child_option(self):
234
238
        br = branch.Branch.open('parent')
247
251
 
248
252
        conf.set('child_submit_format', '0.999')
249
253
        self.run_bzr_error(["No such send format '0.999'"],
250
 
                            'send -f branch -o-')[0]
 
254
                           'send -f branch -o-')[0]
251
255
 
252
256
    def test_message_option(self):
253
257
        self.run_bzr('send', retcode=3)
290
294
    _default_wd = 'local'
291
295
    _default_sent_revs = [b'local']
292
296
    _default_errors = ['Working tree ".*/local/" has uncommitted '
293
 
                       'changes \\(See brz status\\)\\.',]
 
297
                       'changes \\(See brz status\\)\\.', ]
294
298
    _default_additional_error = 'Use --no-strict to force the send.\n'
295
299
    _default_additional_warning = 'Uncommitted changes will not be sent.'
296
300
 
311
315
            revs = self._default_sent_revs
312
316
        out, err = self.run_send(args, err_re=err_re)
313
317
        if len(revs) == 1:
314
 
            bundling_revs = 'Bundling %d revision.\n'% len(revs)
 
318
            bundling_revs = 'Bundling %d revision.\n' % len(revs)
315
319
        else:
316
320
            bundling_revs = 'Bundling %d revisions.\n' % len(revs)
317
321
        if with_warning:
319
323
            self.assertEndsWith(err, bundling_revs)
320
324
        else:
321
325
            self.assertEqual(bundling_revs, err)
322
 
        md = merge_directive.MergeDirective.from_lines(BytesIO(out.encode('utf-8')))
 
326
        md = merge_directive.MergeDirective.from_lines(
 
327
            BytesIO(out.encode('utf-8')))
323
328
        self.assertEqual(b'parent', md.base_revision_id)
324
329
        br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
325
330
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
369
374
         dict(_changes_type='_out_of_sync_trees')),
370
375
        ]
371
376
 
372
 
    _changes_type = None # Set by load_tests
 
377
    _changes_type = None  # Set by load_tests
373
378
 
374
379
    def setUp(self):
375
380
        super(TestSendStrictWithChanges, self).setUp()
404
409
        # Exercise commands from the checkout directory
405
410
        self._default_wd = 'checkout'
406
411
        self._default_errors = ["Working tree is out of date, please run"
407
 
                                " 'brz update'\\.",]
 
412
                                " 'brz update'\\.", ]
408
413
        self._default_sent_revs = [b'modified-in-local', b'local']
409
414
 
410
415
    def test_send_default(self):