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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
97
97
        self.make_branch_and_tree('.')
98
98
        display = self.run_bzr(['whoami', 'Branch Identity'])[1]
99
99
        self.assertEqual('"Branch Identity" does not seem to contain an '
100
 
                          'email address.  This is allowed, but not '
101
 
                          'recommended.\n', display)
 
100
                         'email address.  This is allowed, but not '
 
101
                         'recommended.\n', display)
102
102
 
103
103
    def test_whoami_not_set(self):
104
104
        """Ensure whoami error if username is not set and not inferred.
122
122
        wt = wt.controldir.open_workingtree()
123
123
        c = wt.branch.get_config_stack()
124
124
        self.assertEqual('Changed Identity <changed@identi.ty>',
125
 
                          c.get('email'))
 
125
                         c.get('email'))
126
126
 
127
127
    def test_whoami_remote_directory(self):
128
128
        """Test --directory option with a remote directory."""
138
138
        # config)
139
139
        c = branch.Branch.open(url).get_config_stack()
140
140
        self.assertEqual('Changed Identity <changed@identi.ty>',
141
 
                          c.get('email'))
 
141
                         c.get('email'))
142
142
        # Ensuring that the value does not come from the breezy.conf file
143
143
        # itself requires some isolation setup
144
144
        self.overrideEnv('BRZ_EMAIL', None)