/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-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
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
36
35
 
37
36
class TestAnnotate(tests.TestCaseWithTransport):
38
37
 
188
187
 
189
188
    def test_annotate_edited_file_no_default(self):
190
189
        # Ensure that when no username is available annotate still works.
191
 
        override_whoami(self)
 
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))
192
195
        tree = self._setup_edited_file()
193
196
        out, err = self.run_bzr('annotate file')
194
197
        self.assertEqual(