← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_version_info.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_version_info.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
 
    symbol_versioning,
 
26
    registry,
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
 
56
75
    def test_rio_null(self):
57
76
        wt = self.make_branch_and_tree('branch')
58
77
 
63
82
        self.assertContainsRe(val, 'build-date:')
64
83
        self.assertContainsRe(val, 'revno: 0')
65
84
 
 
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
 
66
94
    def test_rio_version_text(self):
67
95
        wt = self.create_branch()
68
96
 
136
164
            return new_stanzas[0]
137
165
 
138
166
        stanza = regen()
139
 
        self.failUnless('date' in stanza)
140
 
        self.failUnless('build-date' in stanza)
 
167
        self.assertTrue('date' in stanza)
 
168
        self.assertTrue('build-date' in stanza)
141
169
        self.assertEqual(['3'], stanza.get_all('revno'))
142
170
        self.assertEqual(['r3'], stanza.get_all('revision-id'))
143
171
 
148
176
        stanza = regen(check_for_clean=True, include_file_revisions=True)
149
177
        self.assertEqual(['False'], stanza.get_all('clean'))
150
178
 
151
 
        # XXX: This assumes it's being run against a repository that updates
152
 
        # the root revision on every commit.  Newer ones that use
153
 
        # RootCommitBuilder won't update it on each commit.
 
179
        # This assumes it's being run against a tree that does not update the
 
180
        # root revision on every commit.
154
181
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
155
182
        self.assertEqual(['', 'a', 'b', 'c'], file_rev_stanza.get_all('path'))
156
 
        self.assertEqual(['r3', 'r3', 'r2', 'unversioned'],
 
183
        self.assertEqual(['r1', 'r3', 'r2', 'unversioned'],
157
184
            file_rev_stanza.get_all('revision'))
158
185
        os.remove('branch/c')
159
186
 
171
198
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
172
199
        self.assertEqual(['', 'a', 'b', 'c', 'd'],
173
200
                          file_rev_stanza.get_all('path'))
174
 
        self.assertEqual(['r3', 'modified', 'renamed to d', 'new',
 
201
        self.assertEqual(['r1', 'modified', 'renamed to d', 'new',
175
202
                          'renamed from b'],
176
203
                         file_rev_stanza.get_all('revision'))
177
204
 
181
208
        stanza = regen(check_for_clean=True, include_file_revisions=True)
182
209
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
183
210
        self.assertEqual(['', 'a', 'c', 'd'], file_rev_stanza.get_all('path'))
184
 
        self.assertEqual(['r4', 'r4', 'unversioned', 'removed'],
 
211
        self.assertEqual(['r1', 'r4', 'unversioned', 'removed'],
185
212
                         file_rev_stanza.get_all('revision'))
186
213
 
187
214
    def test_python_null(self):
192
219
        builder.generate(sio)
193
220
        val = sio.getvalue()
194
221
        self.assertContainsRe(val, "'revision_id': None")
195
 
        self.assertContainsRe(val, "'revno': 0")
 
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'")
196
233
 
197
234
    def test_python_version(self):
198
235
        wt = self.create_branch()
223
260
            return tvi
224
261
 
225
262
        tvi = regen()
226
 
        self.assertEqual(3, tvi.version_info['revno'])
 
263
        self.assertEqual('3', tvi.version_info['revno'])
227
264
        self.assertEqual('r3', tvi.version_info['revision_id'])
228
 
        self.failUnless(tvi.version_info.has_key('date'))
 
265
        self.assertTrue(tvi.version_info.has_key('date'))
229
266
        self.assertEqual(None, tvi.version_info['clean'])
230
267
 
231
268
        tvi = regen(check_for_clean=True)
283
320
        self.assertRaises(errors.MissingTemplateVariable, 
284
321
            builder.generate, sio)
285
322
 
 
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
 
286
331
    def test_custom_version_text(self):
287
332
        wt = self.create_branch()
288
333
 
326
371
 
327
372
    def setUp(self):
328
373
        super(TestVersionInfoFormatRegistry, self).setUp()
329
 
        registry = version_info_formats.format_registry
330
 
        self._default_key = registry._default_key
331
 
        self._dict = registry._dict.copy()
332
 
        self._help_dict = registry._help_dict.copy()
333
 
        self._info_dict = registry._info_dict.copy()
334
 
        self.addCleanup(self._cleanup)
335
 
 
336
 
    def _cleanup(self):
337
 
        # Restore the registry to pristine state after the test runs
338
 
        registry = version_info_formats.format_registry
339
 
        registry._default_key = self._default_key
340
 
        registry._dict = self._dict
341
 
        registry._help_dict = self._help_dict
342
 
        registry._info_dict = self._info_dict
 
374
        self.overrideAttr(version_info_formats,
 
375
                          'format_registry', registry.Registry())
343
376
 
344
377
    def test_register_remove(self):
345
378
        registry = version_info_formats.format_registry