← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_whoami.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 15:54:17 UTC
  • mfrom: (6428 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105155417-zvjqr0v78zp332e0
Merge trunk resolving conflicts and fixing more test failures related to
more option being migrated which in turn reduce some hpss_calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_whoami.py
138
138
        c = branch.Branch.open(url).get_config_stack()
139
139
        self.assertEquals('Changed Identity <changed@identi.ty>',
140
140
                          c.get('email'))
141
 
        # Ensuring that the value does not come from bazaar.conf requires some
142
 
        # isolation setup
 
141
        # Ensuring that the value does not come from the bazaar.conf file
 
142
        # itself requires some isolation setup
143
143
        self.overrideEnv('BZR_EMAIL', None)
144
144
        self.overrideEnv('EMAIL', None)
145
145
        self.overrideAttr(config, '_auto_user_id', lambda: (None, None))