/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 brzlib/tests/blackbox/test_whoami.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 14:47:52 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521144752-8o6jt0a6xat9g7lm
More renames; commands in output, environment variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/blackbox/test_whoami.py
64
64
 
65
65
        # Verify that the environment variable overrides the value
66
66
        # in the file
67
 
        self.overrideEnv('BZR_EMAIL', 'Different ID <other@environ.ment>')
 
67
        self.overrideEnv('BRZ_EMAIL', 'Different ID <other@environ.ment>')
68
68
        self.assertWhoAmI('Different ID <other@environ.ment>')
69
69
        self.assertWhoAmI('other@environ.ment', '--email')
70
70
 
101
101
        """Ensure whoami error if username is not set and not inferred.
102
102
        """
103
103
        self.overrideEnv('EMAIL', None)
104
 
        self.overrideEnv('BZR_EMAIL', None)
 
104
        self.overrideEnv('BRZ_EMAIL', None)
105
105
        # Also, make sure that it's not inferred from mailname.
106
106
        self.overrideAttr(config, '_auto_user_id', lambda: (None, None))
107
107
        out, err = self.run_bzr(['whoami'], 3)
138
138
                          c.get('email'))
139
139
        # Ensuring that the value does not come from the bazaar.conf file
140
140
        # itself requires some isolation setup
141
 
        self.overrideEnv('BZR_EMAIL', None)
 
141
        self.overrideEnv('BRZ_EMAIL', None)
142
142
        self.overrideEnv('EMAIL', None)
143
143
        self.overrideAttr(config, '_auto_user_id', lambda: (None, None))
144
144
        global_conf = config.GlobalStack()