~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_version_info.py

  • Committer: Martin Pool
  • Date: 2010-01-15 04:17:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@sourcefrog.net-20100115041757-cd8pu9o5a511jc8q
Rip out most remaining uses of DummyProgressBar

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
 
24
24
from bzrlib import (
25
25
    errors,
26
 
    registry,
 
26
    symbol_versioning,
27
27
    tests,
28
28
    version_info_formats,
29
29
    )
53
53
 
54
54
        return wt
55
55
 
56
 
    def create_tree_with_dotted_revno(self):
57
 
        wt = self.make_branch_and_tree('branch')
58
 
        self.build_tree(['branch/a'])
59
 
        wt.add('a')
60
 
        wt.commit('a', rev_id='r1')
61
 
 
62
 
        other = wt.bzrdir.sprout('other').open_workingtree()
63
 
        self.build_tree(['other/b.a'])
64
 
        other.add(['b.a'])
65
 
        other.commit('b.a', rev_id='o2')
66
 
 
67
 
        os.chdir('branch')
68
 
        self.run_bzr('merge ../other')
69
 
        wt.commit('merge', rev_id='merge')
70
 
 
71
 
        wt.update(revision='o2')
72
 
 
73
 
        return wt
74
 
 
75
56
    def test_rio_null(self):
76
57
        wt = self.make_branch_and_tree('branch')
77
58
 
82
63
        self.assertContainsRe(val, 'build-date:')
83
64
        self.assertContainsRe(val, 'revno: 0')
84
65
 
85
 
    def test_rio_dotted_revno(self):
86
 
        wt = self.create_tree_with_dotted_revno()
87
 
 
88
 
        sio = StringIO()
89
 
        builder = RioVersionInfoBuilder(wt.branch, working_tree=wt)
90
 
        builder.generate(sio)
91
 
        val = sio.getvalue()
92
 
        self.assertContainsRe(val, 'revno: 1.1.1')
93
 
 
94
66
    def test_rio_version_text(self):
95
67
        wt = self.create_branch()
96
68
 
164
136
            return new_stanzas[0]
165
137
 
166
138
        stanza = regen()
167
 
        self.assertTrue('date' in stanza)
168
 
        self.assertTrue('build-date' in stanza)
 
139
        self.failUnless('date' in stanza)
 
140
        self.failUnless('build-date' in stanza)
169
141
        self.assertEqual(['3'], stanza.get_all('revno'))
170
142
        self.assertEqual(['r3'], stanza.get_all('revision-id'))
171
143
 
219
191
        builder.generate(sio)
220
192
        val = sio.getvalue()
221
193
        self.assertContainsRe(val, "'revision_id': None")
222
 
        self.assertContainsRe(val, "'revno': '0'")
223
 
        self.assertNotContainsString(val, '\n\n\n\n')
224
 
 
225
 
    def test_python_dotted_revno(self):
226
 
        wt = self.create_tree_with_dotted_revno()
227
 
 
228
 
        sio = StringIO()
229
 
        builder = PythonVersionInfoBuilder(wt.branch, working_tree=wt)
230
 
        builder.generate(sio)
231
 
        val = sio.getvalue()
232
 
        self.assertContainsRe(val, "'revno': '1.1.1'")
 
194
        self.assertContainsRe(val, "'revno': 0")
233
195
 
234
196
    def test_python_version(self):
235
197
        wt = self.create_branch()
260
222
            return tvi
261
223
 
262
224
        tvi = regen()
263
 
        self.assertEqual('3', tvi.version_info['revno'])
 
225
        self.assertEqual(3, tvi.version_info['revno'])
264
226
        self.assertEqual('r3', tvi.version_info['revision_id'])
265
 
        self.assertTrue(tvi.version_info.has_key('date'))
 
227
        self.failUnless(tvi.version_info.has_key('date'))
266
228
        self.assertEqual(None, tvi.version_info['clean'])
267
229
 
268
230
        tvi = regen(check_for_clean=True)
320
282
        self.assertRaises(errors.MissingTemplateVariable, 
321
283
            builder.generate, sio)
322
284
 
323
 
    def test_custom_dotted_revno(self):
324
 
        sio = StringIO()
325
 
        wt = self.create_tree_with_dotted_revno()
326
 
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt, 
327
 
            template='{revno} revid: {revision_id}')
328
 
        builder.generate(sio)
329
 
        self.assertEquals("1.1.1 revid: o2", sio.getvalue())
330
 
 
331
285
    def test_custom_version_text(self):
332
286
        wt = self.create_branch()
333
287
 
371
325
 
372
326
    def setUp(self):
373
327
        super(TestVersionInfoFormatRegistry, self).setUp()
374
 
        self.overrideAttr(version_info_formats,
375
 
                          'format_registry', registry.Registry())
 
328
        registry = version_info_formats.format_registry
 
329
        self._default_key = registry._default_key
 
330
        self._dict = registry._dict.copy()
 
331
        self._help_dict = registry._help_dict.copy()
 
332
        self._info_dict = registry._info_dict.copy()
 
333
        self.addCleanup(self._cleanup)
 
334
 
 
335
    def _cleanup(self):
 
336
        # Restore the registry to pristine state after the test runs
 
337
        registry = version_info_formats.format_registry
 
338
        registry._default_key = self._default_key
 
339
        registry._dict = self._dict
 
340
        registry._help_dict = self._help_dict
 
341
        registry._info_dict = self._info_dict
376
342
 
377
343
    def test_register_remove(self):
378
344
        registry = version_info_formats.format_registry