← 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: Jelmer Vernooij
  • Date: 2012-01-05 16:03:11 UTC
  • mfrom: (6432 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6433.
  • Revision ID: jelmer@samba.org-20120105160311-12o5p67kin1v3zps
Merge bzr.dev.

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
        self.overrideEnv('BZR_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'
326
326
        # being too low. If rpc_count increases, more network roundtrips have
327
327
        # become necessary for this use case. Please do not adjust this number
328
328
        # upwards without agreement from bzr's network support maintainers.
329
 
        self.assertLength(15, self.hpss_calls)
 
329
        self.assertLength(16, self.hpss_calls)
 
330
        self.assertLength(1, self.hpss_connections)
330
331
        self.expectFailure("annotate accesses inventories, which require VFS access",
331
332
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)