← 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

(gz) Remove bzrlib/util/elementtree/ package (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
24
24
"""
25
25
 
26
26
 
27
 
from bzrlib import tests
 
27
from bzrlib import (
 
28
    config,
 
29
    tests,
 
30
    )
28
31
 
29
 
from bzrlib.config import extract_email_address
 
32
from bzrlib.tests.matchers import ContainsNoVfsCalls
30
33
from bzrlib.urlutils import joinpath
31
34
 
32
35
 
160
163
        tree.add('file')
161
164
        tree.commit('add file', committer="test@host", rev_id="rev1")
162
165
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
163
 
        tree.branch.get_config().set_user_option('email', 'current@host2')
164
166
        return tree
165
167
 
166
168
    def test_annotate_cmd_revspec_branch(self):
176
178
 
177
179
    def test_annotate_edited_file(self):
178
180
        tree = self._setup_edited_file()
 
181
        self.overrideEnv('BZR_EMAIL', 'current@host2')
179
182
        out, err = self.run_bzr('annotate file')
180
183
        self.assertEqual(
181
184
            '1   test@ho | foo\n'
183
186
            '1   test@ho | gam\n',
184
187
            out)
185
188
 
 
189
    def test_annotate_edited_file_no_default(self):
 
190
        # Ensure that when no username is available annotate still works.
 
191
        self.overrideEnv('EMAIL', None)
 
192
        self.overrideEnv('BZR_EMAIL', None)
 
193
        # Also, make sure that it's not inferred from mailname.
 
194
        self.overrideAttr(config, '_auto_user_id',
 
195
            lambda: (None, None))
 
196
        tree = self._setup_edited_file()
 
197
        out, err = self.run_bzr('annotate file')
 
198
        self.assertEqual(
 
199
            '1   test@ho | foo\n'
 
200
            '2?  local u | bar\n'
 
201
            '1   test@ho | gam\n',
 
202
            out)
 
203
 
186
204
    def test_annotate_edited_file_show_ids(self):
187
205
        tree = self._setup_edited_file()
 
206
        self.overrideEnv('BZR_EMAIL', 'current@host2')
188
207
        out, err = self.run_bzr('annotate file --show-ids')
189
208
        self.assertEqual(
190
209
            '    rev1 | foo\n'
214
233
    def test_annotated_edited_merged_file_revnos(self):
215
234
        wt = self._create_merged_file()
216
235
        out, err = self.run_bzr(['annotate', 'file'])
217
 
        email = extract_email_address(wt.branch.get_config().username())
 
236
        email = config.extract_email_address(wt.branch.get_config().username())
218
237
        self.assertEqual(
219
238
            '3?    %-7s | local\n'
220
239
            '1     test@ho | foo\n'
289
308
        wt.commit('commit', committer='test@user')
290
309
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
291
310
        self.assertEqualDiff('1   test@us | my helicopter\n', out)
 
311
 
 
312
 
 
313
class TestSmartServerAnnotate(tests.TestCaseWithTransport):
 
314
 
 
315
    def test_simple_annotate(self):
 
316
        self.setup_smart_server_with_call_log()
 
317
        wt = self.make_branch_and_tree('branch')
 
318
        self.build_tree_contents([('branch/hello.txt', 'my helicopter\n')])
 
319
        wt.add(['hello.txt'])
 
320
        wt.commit('commit', committer='test@user')
 
321
        self.reset_smart_call_log()
 
322
        out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),
 
323
            "hello.txt"])
 
324
        # This figure represent the amount of work to perform this use case. It
 
325
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
326
        # being too low. If rpc_count increases, more network roundtrips have
 
327
        # become necessary for this use case. Please do not adjust this number
 
328
        # upwards without agreement from bzr's network support maintainers.
 
329
        self.assertLength(16, self.hpss_calls)
 
330
        self.assertLength(1, self.hpss_connections)
 
331
        self.expectFailure("annotate accesses inventories, which require VFS access",
 
332
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)