← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-18 16:55:04 UTC
  • mfrom: (6437.23.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6469.
  • Revision ID: jelmer@samba.org-20120218165504-c9oe5c5ue805y8wp
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
1197
1197
        b = self.make_branch('!repo')
1198
1198
        self.assertEqual('!repo', b.get_config().get_nickname())
1199
1199
 
 
1200
    def test_autonick_uses_branch_name(self):
 
1201
        b = self.make_branch('foo', name='bar')
 
1202
        self.assertEqual('bar', b.get_config().get_nickname())
 
1203
 
1200
1204
    def test_warn_if_masked(self):
1201
1205
        warnings = []
1202
1206
        def warning(*args):