← 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: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_version_info.py
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
 
176
148
        stanza = regen(check_for_clean=True, include_file_revisions=True)
177
149
        self.assertEqual(['False'], stanza.get_all('clean'))
178
150
 
179
 
        # This assumes it's being run against a tree that does not update the
180
 
        # root revision on every commit.
 
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.
181
154
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
182
155
        self.assertEqual(['', 'a', 'b', 'c'], file_rev_stanza.get_all('path'))
183
 
        self.assertEqual(['r1', 'r3', 'r2', 'unversioned'],
 
156
        self.assertEqual(['r3', 'r3', 'r2', 'unversioned'],
184
157
            file_rev_stanza.get_all('revision'))
185
158
        os.remove('branch/c')
186
159
 
198
171
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
199
172
        self.assertEqual(['', 'a', 'b', 'c', 'd'],
200
173
                          file_rev_stanza.get_all('path'))
201
 
        self.assertEqual(['r1', 'modified', 'renamed to d', 'new',
 
174
        self.assertEqual(['r3', 'modified', 'renamed to d', 'new',
202
175
                          'renamed from b'],
203
176
                         file_rev_stanza.get_all('revision'))
204
177
 
208
181
        stanza = regen(check_for_clean=True, include_file_revisions=True)
209
182
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
210
183
        self.assertEqual(['', 'a', 'c', 'd'], file_rev_stanza.get_all('path'))
211
 
        self.assertEqual(['r1', 'r4', 'unversioned', 'removed'],
 
184
        self.assertEqual(['r4', 'r4', 'unversioned', 'removed'],
212
185
                         file_rev_stanza.get_all('revision'))
213
186
 
214
187
    def test_python_null(self):
219
192
        builder.generate(sio)
220
193
        val = sio.getvalue()
221
194
        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'")
 
195
        self.assertContainsRe(val, "'revno': 0")
233
196
 
234
197
    def test_python_version(self):
235
198
        wt = self.create_branch()
260
223
            return tvi
261
224
 
262
225
        tvi = regen()
263
 
        self.assertEqual('3', tvi.version_info['revno'])
 
226
        self.assertEqual(3, tvi.version_info['revno'])
264
227
        self.assertEqual('r3', tvi.version_info['revision_id'])
265
 
        self.assertTrue(tvi.version_info.has_key('date'))
 
228
        self.failUnless(tvi.version_info.has_key('date'))
266
229
        self.assertEqual(None, tvi.version_info['clean'])
267
230
 
268
231
        tvi = regen(check_for_clean=True)
320
283
        self.assertRaises(errors.MissingTemplateVariable, 
321
284
            builder.generate, sio)
322
285
 
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
286
    def test_custom_version_text(self):
332
287
        wt = self.create_branch()
333
288
 
371
326
 
372
327
    def setUp(self):
373
328
        super(TestVersionInfoFormatRegistry, self).setUp()
374
 
        self.overrideAttr(version_info_formats,
375
 
                          'format_registry', registry.Registry())
 
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
376
343
 
377
344
    def test_register_remove(self):
378
345
        registry = version_info_formats.format_registry