← 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

(vila) Fix test failures blocking package builds. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
24
24
"""
25
25
 
26
26
 
27
 
import os
28
 
 
29
 
from bzrlib.branch import Branch
30
 
from bzrlib.config import extract_email_address
31
 
from bzrlib.tests import TestCaseWithTransport
32
 
 
33
 
 
34
 
class TestAnnotate(TestCaseWithTransport):
 
27
from bzrlib import (
 
28
    config,
 
29
    tests,
 
30
    )
 
31
 
 
32
from bzrlib.tests.matchers import ContainsNoVfsCalls
 
33
from bzrlib.urlutils import joinpath
 
34
 
 
35
 
 
36
class TestAnnotate(tests.TestCaseWithTransport):
35
37
 
36
38
    def setUp(self):
37
39
        super(TestAnnotate, self).setUp()
139
141
        out, err = self.run_bzr('annotate hello.txt -r 10',
140
142
                                retcode=3)
141
143
        self.assertEqual('', out)
142
 
        self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')
 
144
        self.assertContainsRe(err, "Requested revision: '10' does not exist")
143
145
 
144
146
    def test_annotate_cmd_two_revisions(self):
145
147
        out, err = self.run_bzr('annotate hello.txt -r1..2',
150
152
                         err)
151
153
 
152
154
 
153
 
class TestSimpleAnnotate(TestCaseWithTransport):
 
155
class TestSimpleAnnotate(tests.TestCaseWithTransport):
154
156
    """Annotate tests with no complex setup."""
155
157
 
156
 
    def _setup_edited_file(self):
 
158
    def _setup_edited_file(self, relpath='.'):
157
159
        """Create a tree with a locally edited file."""
158
 
        tree = self.make_branch_and_tree('.')
159
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
160
        tree = self.make_branch_and_tree(relpath)
 
161
        file_relpath = joinpath(relpath, 'file')
 
162
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
160
163
        tree.add('file')
161
164
        tree.commit('add file', committer="test@host", rev_id="rev1")
162
 
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
163
 
        tree.branch.get_config().set_user_option('email', 'current@host2')
 
165
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
 
166
        return tree
 
167
 
 
168
    def test_annotate_cmd_revspec_branch(self):
 
169
        tree = self._setup_edited_file('trunk')
 
170
        tree.branch.create_checkout(self.get_url('work'), lightweight=True)
 
171
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
 
172
                                working_dir='work')
 
173
        self.assertEqual('', err)
 
174
        self.assertEqual(
 
175
            '1   test@ho | foo\n'
 
176
            '            | gam\n',
 
177
            out)
164
178
 
165
179
    def test_annotate_edited_file(self):
166
180
        tree = self._setup_edited_file()
 
181
        self.overrideEnv('BZR_EMAIL', 'current@host2')
167
182
        out, err = self.run_bzr('annotate file')
168
183
        self.assertEqual(
169
184
            '1   test@ho | foo\n'
171
186
            '1   test@ho | gam\n',
172
187
            out)
173
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
 
174
204
    def test_annotate_edited_file_show_ids(self):
175
205
        tree = self._setup_edited_file()
 
206
        self.overrideEnv('BZR_EMAIL', 'current@host2')
176
207
        out, err = self.run_bzr('annotate file --show-ids')
177
208
        self.assertEqual(
178
209
            '    rev1 | foo\n'
197
228
        tree.merge_from_branch(tree.branch, "rev1.1.1")
198
229
        # edit the file to be 'resolved' and have a further local edit
199
230
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
231
        return tree
200
232
 
201
233
    def test_annotated_edited_merged_file_revnos(self):
202
 
        self._create_merged_file()
203
 
        out, err = self.run_bzr('annotate file')
204
 
        email = extract_email_address(Branch.open('.').get_config().username())
 
234
        wt = self._create_merged_file()
 
235
        out, err = self.run_bzr(['annotate', 'file'])
 
236
        email = config.extract_email_address(
 
237
            wt.branch.get_config_stack().get('email'))
205
238
        self.assertEqual(
206
239
            '3?    %-7s | local\n'
207
240
            '1     test@ho | foo\n'
212
245
 
213
246
    def test_annotated_edited_merged_file_ids(self):
214
247
        self._create_merged_file()
215
 
        out, err = self.run_bzr('annotate file --show-ids')
 
248
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
216
249
        self.assertEqual(
217
250
            'current: | local\n'
218
251
            '    rev1 | foo\n'
222
255
            out)
223
256
 
224
257
    def test_annotate_empty_file(self):
225
 
        tree = self.make_branch_and_tree('tree')
226
 
        self.build_tree_contents([('tree/empty', '')])
 
258
        tree = self.make_branch_and_tree('.')
 
259
        self.build_tree_contents([('empty', '')])
227
260
        tree.add('empty')
228
261
        tree.commit('add empty file')
 
262
        out, err = self.run_bzr(['annotate', 'empty'])
 
263
        self.assertEqual('', out)
229
264
 
230
 
        os.chdir('tree')
231
 
        out, err = self.run_bzr('annotate empty')
 
265
    def test_annotate_removed_file(self):
 
266
        tree = self.make_branch_and_tree('.')
 
267
        self.build_tree_contents([('empty', '')])
 
268
        tree.add('empty')
 
269
        tree.commit('add empty file')
 
270
        # delete the file.
 
271
        tree.remove('empty')
 
272
        tree.commit('remove empty file')
 
273
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
232
274
        self.assertEqual('', out)
233
275
 
234
276
    def test_annotate_empty_file_show_ids(self):
235
 
        tree = self.make_branch_and_tree('tree')
236
 
        self.build_tree_contents([('tree/empty', '')])
 
277
        tree = self.make_branch_and_tree('.')
 
278
        self.build_tree_contents([('empty', '')])
237
279
        tree.add('empty')
238
280
        tree.commit('add empty file')
239
 
 
240
 
        os.chdir('tree')
241
281
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
242
282
        self.assertEqual('', out)
243
283
 
244
284
    def test_annotate_nonexistant_file(self):
245
 
        tree = self.make_branch_and_tree('tree')
246
 
        self.build_tree(['tree/file'])
 
285
        tree = self.make_branch_and_tree('.')
 
286
        self.build_tree(['file'])
247
287
        tree.add(['file'])
248
288
        tree.commit('add a file')
249
 
 
250
 
        os.chdir('tree')
251
 
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
 
289
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
252
290
        self.assertEqual('', out)
253
291
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
254
292
 
255
293
    def test_annotate_without_workingtree(self):
256
 
        tree = self.make_branch_and_tree('branch')
257
 
        self.build_tree_contents([('branch/empty', '')])
 
294
        tree = self.make_branch_and_tree('.')
 
295
        self.build_tree_contents([('empty', '')])
258
296
        tree.add('empty')
259
297
        tree.commit('add empty file')
260
298
        bzrdir = tree.branch.bzrdir
261
299
        bzrdir.destroy_workingtree()
262
300
        self.assertFalse(bzrdir.has_workingtree())
263
 
 
264
 
        os.chdir('branch')
265
 
        out, err = self.run_bzr('annotate empty')
 
301
        out, err = self.run_bzr(['annotate', 'empty'])
266
302
        self.assertEqual('', out)
 
303
 
 
304
    def test_annotate_directory(self):
 
305
        """Test --directory option"""
 
306
        wt = self.make_branch_and_tree('a')
 
307
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
 
308
        wt.add(['hello.txt'])
 
309
        wt.commit('commit', committer='test@user')
 
310
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
311
        self.assertEqualDiff('1   test@us | my helicopter\n', out)
 
312
 
 
313
 
 
314
class TestSmartServerAnnotate(tests.TestCaseWithTransport):
 
315
 
 
316
    def test_simple_annotate(self):
 
317
        self.setup_smart_server_with_call_log()
 
318
        wt = self.make_branch_and_tree('branch')
 
319
        self.build_tree_contents([('branch/hello.txt', 'my helicopter\n')])
 
320
        wt.add(['hello.txt'])
 
321
        wt.commit('commit', committer='test@user')
 
322
        self.reset_smart_call_log()
 
323
        out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),
 
324
            "hello.txt"])
 
325
        # This figure represent the amount of work to perform this use case. It
 
326
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
327
        # being too low. If rpc_count increases, more network roundtrips have
 
328
        # become necessary for this use case. Please do not adjust this number
 
329
        # upwards without agreement from bzr's network support maintainers.
 
330
        self.assertLength(16, self.hpss_calls)
 
331
        self.assertLength(1, self.hpss_connections)
 
332
        self.expectFailure("annotate accesses inventories, which require VFS access",
 
333
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)