/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/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-22 16:18:31 UTC
  • mfrom: (6402 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6403.
  • Revision ID: jelmer@samba.org-20111222161831-4c2mj8x89741y8x2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
403
403
    def test_light_checkout_with_references(self):
404
404
        self.do_checkout_test(lightweight=True)
405
405
 
406
 
    def test_set_push(self):
407
 
        branch = self.make_branch('source', format=self.get_format_name())
408
 
        branch.get_config().set_user_option('push_location', 'old',
409
 
            store=config.STORE_LOCATION)
410
 
        warnings = []
411
 
        def warning(*args):
412
 
            warnings.append(args[0] % args[1:])
413
 
        _warning = trace.warning
414
 
        trace.warning = warning
415
 
        try:
416
 
            branch.set_push_location('new')
417
 
        finally:
418
 
            trace.warning = _warning
419
 
        self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
420
 
                         'locations.conf')
421
 
 
422
406
 
423
407
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
424
408