← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-01-04 17:12:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6428.
  • Revision ID: v.ladeuil+lp@free.fr-20120104171242-5k48d5lp90c8ej0v
Migrate more branch options to config stacks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
178
178
 
179
179
    def test_annotate_edited_file(self):
180
180
        tree = self._setup_edited_file()
181
 
        tree.branch.get_config().set_user_option('email', 'current@host2')
 
181
        tree.branch.get_config_stack().set('email', 'current@host2')
182
182
        out, err = self.run_bzr('annotate file')
183
183
        self.assertEqual(
184
184
            '1   test@ho | foo\n'
203
203
 
204
204
    def test_annotate_edited_file_show_ids(self):
205
205
        tree = self._setup_edited_file()
206
 
        tree.branch.get_config().set_user_option('email', 'current@host2')
 
206
        self.overrideEnv('BZR_EMAIL', 'current@host2')
207
207
        out, err = self.run_bzr('annotate file --show-ids')
208
208
        self.assertEqual(
209
209
            '    rev1 | foo\n'