← 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: Patch Queue Manager
  • Date: 2012-02-18 17:24:52 UTC
  • mfrom: (6468.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120218172452-x7mk642v7mwxtyo1
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

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):