/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_annotate.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-22 11:51:56 UTC
  • mfrom: (7356 work)
  • mto: This revision was merged to the branch mainline in revision 7358.
  • Revision ID: jelmer@jelmer.uk-20190622115156-20uwy6b97g94bbv1
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_annotate.py
32
32
from breezy.tests.matchers import ContainsNoVfsCalls
33
33
from breezy.urlutils import joinpath
34
34
 
 
35
from ..test_bedding import override_whoami
35
36
 
36
37
class TestAnnotate(tests.TestCaseWithTransport):
37
38
 
187
188
 
188
189
    def test_annotate_edited_file_no_default(self):
189
190
        # Ensure that when no username is available annotate still works.
190
 
        self.overrideEnv('EMAIL', None)
191
 
        self.overrideEnv('BRZ_EMAIL', None)
192
 
        # Also, make sure that it's not inferred from mailname.
193
 
        self.overrideAttr(config, '_auto_user_id',
194
 
                          lambda: (None, None))
 
191
        override_whoami(self)
195
192
        tree = self._setup_edited_file()
196
193
        out, err = self.run_bzr('annotate file')
197
194
        self.assertEqual(