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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-01 00:40:31 UTC
  • mfrom: (4081.2.5 bug513322-first)
  • Revision ID: pqm@pqm.ubuntu.com-20100401004031-pc7s84z6ahqunmy2
(mbp, for gagern) show first apparent author in gnu changelog

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
307
307
    _default_sent_revs = ['local']
308
308
    _default_errors = ['Working tree ".*/local/" has uncommitted '
309
309
                       'changes \(See bzr status\)\.',]
310
 
    _default_additional_error = 'Use --no-strict to force the send.\n'
311
 
    _default_additional_warning = 'Uncommitted changes will not be sent.'
312
310
 
313
311
    def set_config_send_strict(self, value):
314
312
        # set config var (any of bazaar.conf, locations.conf, branch.conf
317
315
        conf.set_user_option('send_strict', value)
318
316
 
319
317
    def assertSendFails(self, args):
320
 
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
321
 
        self.assertContainsRe(err, self._default_additional_error)
 
318
        self.run_send(args, rc=3, err_re=self._default_errors)
322
319
 
323
 
    def assertSendSucceeds(self, args, revs=None, with_warning=False):
324
 
        if with_warning:
325
 
            err_re = self._default_errors
326
 
        else:
327
 
            err_re = []
 
320
    def assertSendSucceeds(self, args, revs=None):
328
321
        if revs is None:
329
322
            revs = self._default_sent_revs
330
 
        out, err = self.run_send(args, err_re=err_re)
331
 
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
332
 
        if with_warning:
333
 
            self.assertContainsRe(err, self._default_additional_warning)
334
 
            self.assertEndsWith(err, bundling_revs)
335
 
        else:
336
 
            self.assertEquals(bundling_revs, err)
 
323
        out, err = self.run_send(args)
 
324
        self.assertEquals(
 
325
            'Bundling %d revision(s).\n' % len(revs), err)
337
326
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
338
327
        self.assertEqual('parent', md.base_revision_id)
339
328
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
407
396
        self._default_sent_revs = ['modified-in-local', 'local']
408
397
 
409
398
    def test_send_default(self):
410
 
        self.assertSendSucceeds([], with_warning=True)
 
399
        self.assertSendFails([])
411
400
 
412
401
    def test_send_with_revision(self):
413
402
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
423
412
        self.assertSendFails([])
424
413
        self.assertSendSucceeds(['--no-strict'])
425
414
 
 
415
 
426
416
    def test_send_bogus_config_var_ignored(self):
427
417
        self.set_config_send_strict("I'm unsure")
428
 
        self.assertSendSucceeds([], with_warning=True)
 
418
        self.assertSendFails([])
 
419
 
429
420
 
430
421
    def test_send_no_strict_command_line_override_config(self):
431
422
        self.set_config_send_strict('true')