/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_version_info.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2012, 2016 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
16
16
 
17
17
"""Tests for version_info"""
18
18
 
 
19
from cStringIO import StringIO
 
20
import imp
19
21
import os
 
22
import sys
20
23
 
21
 
from .. import (
 
24
from bzrlib import (
 
25
    errors,
22
26
    registry,
 
27
    symbol_versioning,
23
28
    tests,
24
29
    version_info_formats,
25
30
    )
26
 
from ..sixish import (
27
 
    BytesIO,
28
 
    StringIO,
29
 
    )
30
 
from . import TestCaseWithTransport
31
 
from ..rio import read_stanzas, read_stanzas_unicode
32
 
 
33
 
from ..version_info_formats.format_custom import (
34
 
    CustomVersionInfoBuilder,
35
 
    MissingTemplateVariable,
36
 
    NoTemplate,
37
 
    )
38
 
from ..version_info_formats.format_rio import RioVersionInfoBuilder
39
 
from ..version_info_formats.format_python import PythonVersionInfoBuilder
40
 
 
41
 
 
42
 
class VersionInfoTestCase(TestCaseWithTransport):
 
31
from bzrlib.tests import TestCaseWithTransport
 
32
from bzrlib.rio import read_stanzas
 
33
 
 
34
from bzrlib.version_info_formats.format_custom import CustomVersionInfoBuilder
 
35
from bzrlib.version_info_formats.format_rio import RioVersionInfoBuilder
 
36
from bzrlib.version_info_formats.format_python import PythonVersionInfoBuilder
 
37
 
 
38
 
 
39
class TestVersionInfo(TestCaseWithTransport):
43
40
 
44
41
    def create_branch(self):
45
42
        wt = self.make_branch_and_tree('branch')
46
43
 
47
44
        self.build_tree(['branch/a'])
48
45
        wt.add('a')
49
 
        wt.commit('a', rev_id=b'r1')
 
46
        wt.commit('a', rev_id='r1')
50
47
 
51
48
        self.build_tree(['branch/b'])
52
49
        wt.add('b')
53
 
        wt.commit('b', rev_id=b'r2')
54
 
 
55
 
        self.build_tree_contents([('branch/a', b'new contents\n')])
56
 
        wt.commit(u'\xe52', rev_id=b'r3')
57
 
 
58
 
        return wt
59
 
 
60
 
    def create_tree_with_dotted_revno(self):
61
 
        wt = self.make_branch_and_tree('branch')
62
 
        self.build_tree(['branch/a'])
63
 
        wt.add('a')
64
 
        wt.commit('a', rev_id=b'r1')
65
 
 
66
 
        other = wt.controldir.sprout('other').open_workingtree()
67
 
        self.build_tree(['other/b.a'])
68
 
        other.add(['b.a'])
69
 
        other.commit('b.a', rev_id=b'o2')
70
 
 
71
 
        os.chdir('branch')
72
 
        self.run_bzr('merge ../other')
73
 
        wt.commit('merge', rev_id=b'merge')
74
 
 
75
 
        wt.update(revision=b'o2')
76
 
 
77
 
        return wt
78
 
 
79
 
 
80
 
class TestVersionInfoRio(VersionInfoTestCase):
 
50
        wt.commit('b', rev_id='r2')
 
51
 
 
52
        self.build_tree_contents([('branch/a', 'new contents\n')])
 
53
        wt.commit(u'\xe52', rev_id='r3')
 
54
 
 
55
        return wt
81
56
 
82
57
    def test_rio_null(self):
83
58
        wt = self.make_branch_and_tree('branch')
89
64
        self.assertContainsRe(val, 'build-date:')
90
65
        self.assertContainsRe(val, 'revno: 0')
91
66
 
92
 
    def test_rio_dotted_revno(self):
93
 
        wt = self.create_tree_with_dotted_revno()
94
 
 
95
 
        sio = StringIO()
96
 
        builder = RioVersionInfoBuilder(wt.branch, working_tree=wt)
97
 
        builder.generate(sio)
98
 
        val = sio.getvalue()
99
 
        self.assertContainsRe(val, 'revno: 1.1.1')
100
 
 
101
 
    def regen_text(self, wt, **kwargs):
102
 
        sio = StringIO()
103
 
        builder = RioVersionInfoBuilder(wt.branch, working_tree=wt, **kwargs)
104
 
        builder.generate(sio)
105
 
        val = sio.getvalue()
106
 
        return val
107
 
 
108
 
    def test_simple(self):
 
67
    def test_rio_version_text(self):
109
68
        wt = self.create_branch()
110
69
 
111
 
        val = self.regen_text(wt)
 
70
        def regen(**kwargs):
 
71
            sio = StringIO()
 
72
            builder = RioVersionInfoBuilder(wt.branch, working_tree=wt,
 
73
                                            **kwargs)
 
74
            builder.generate(sio)
 
75
            val = sio.getvalue()
 
76
            return val
 
77
 
 
78
        val = regen()
112
79
        self.assertContainsRe(val, 'build-date:')
113
80
        self.assertContainsRe(val, 'date:')
114
81
        self.assertContainsRe(val, 'revno: 3')
115
82
        self.assertContainsRe(val, 'revision-id: r3')
116
83
 
117
 
    def test_clean(self):
118
 
        wt = self.create_branch()
119
 
        val = self.regen_text(wt, check_for_clean=True)
 
84
        val = regen(check_for_clean=True)
120
85
        self.assertContainsRe(val, 'clean: True')
121
86
 
122
 
    def test_no_clean(self):
123
 
        wt = self.create_branch()
124
87
        self.build_tree(['branch/c'])
125
 
        val = self.regen_text(wt, check_for_clean=True)
 
88
        val = regen(check_for_clean=True)
126
89
        self.assertContainsRe(val, 'clean: False')
127
 
 
128
 
    def test_history(self):
129
 
        wt = self.create_branch()
130
 
 
131
 
        val = self.regen_text(wt, include_revision_history=True)
 
90
        os.remove('branch/c')
 
91
 
 
92
        val = regen(include_revision_history=True)
132
93
        self.assertContainsRe(val, 'id: r1')
133
94
        self.assertContainsRe(val, 'message: a')
134
95
        self.assertContainsRe(val, 'id: r2')
135
96
        self.assertContainsRe(val, 'message: b')
136
97
        self.assertContainsRe(val, 'id: r3')
137
 
        self.assertContainsRe(val, 'message: \xe5')
138
 
 
139
 
    def regen(self, wt, **kwargs):
140
 
        sio = StringIO()
141
 
        builder = RioVersionInfoBuilder(wt.branch, working_tree=wt, **kwargs)
142
 
        builder.generate(sio)
143
 
        sio.seek(0)
144
 
        stanzas = list(read_stanzas_unicode(sio))
145
 
        self.assertEqual(1, len(stanzas))
146
 
        return stanzas[0]
 
98
        self.assertContainsRe(val, 'message: \xc3\xa52') # utf8 encoding '\xe5'
147
99
 
148
100
    def test_rio_version_hook(self):
149
101
        def update_stanza(rev, stanza):
152
104
            'revision', update_stanza, None)
153
105
        wt = self.create_branch()
154
106
 
155
 
        stanza = self.regen(wt)
 
107
        def regen(**kwargs):
 
108
            sio = StringIO()
 
109
            builder = RioVersionInfoBuilder(wt.branch, working_tree=wt,
 
110
                                            **kwargs)
 
111
            builder.generate(sio)
 
112
            sio.seek(0)
 
113
            stanzas = list(read_stanzas(sio))
 
114
            self.assertEqual(1, len(stanzas))
 
115
            return stanzas[0]
 
116
 
 
117
        stanza = regen()
156
118
        self.assertEqual(['bloe'], stanza.get_all('bla'))
157
119
 
158
 
    def get_one_stanza(self, stanza, key):
159
 
        new_stanzas = list(read_stanzas(BytesIO(stanza[key].encode('utf8'))))
160
 
        self.assertEqual(1, len(new_stanzas))
161
 
        return new_stanzas[0]
162
 
 
163
 
    def test_build_date(self):
 
120
    def test_rio_version(self):
164
121
        wt = self.create_branch()
165
 
        stanza = self.regen(wt)
166
 
        self.assertTrue('date' in stanza)
167
 
        self.assertTrue('build-date' in stanza)
 
122
 
 
123
        def regen(**kwargs):
 
124
            sio = StringIO()
 
125
            builder = RioVersionInfoBuilder(wt.branch, working_tree=wt,
 
126
                                            **kwargs)
 
127
            builder.generate(sio)
 
128
            sio.seek(0)
 
129
            stanzas = list(read_stanzas(sio))
 
130
            self.assertEqual(1, len(stanzas))
 
131
            return stanzas[0]
 
132
 
 
133
        def get_one_stanza(stanza, key):
 
134
            new_stanzas = list(read_stanzas(
 
135
                                StringIO(stanza[key].encode('utf8'))))
 
136
            self.assertEqual(1, len(new_stanzas))
 
137
            return new_stanzas[0]
 
138
 
 
139
        stanza = regen()
 
140
        self.failUnless('date' in stanza)
 
141
        self.failUnless('build-date' in stanza)
168
142
        self.assertEqual(['3'], stanza.get_all('revno'))
169
143
        self.assertEqual(['r3'], stanza.get_all('revision-id'))
170
144
 
171
 
    def test_not_clean(self):
172
 
        wt = self.create_branch()
 
145
        stanza = regen(check_for_clean=True)
 
146
        self.assertEqual(['True'], stanza.get_all('clean'))
 
147
 
173
148
        self.build_tree(['branch/c'])
174
 
        stanza = self.regen(wt, check_for_clean=True,
175
 
                            include_file_revisions=True)
 
149
        stanza = regen(check_for_clean=True, include_file_revisions=True)
176
150
        self.assertEqual(['False'], stanza.get_all('clean'))
177
151
 
178
 
    def test_file_revisions(self):
179
 
        wt = self.create_branch()
180
 
        self.build_tree(['branch/c'])
181
 
        stanza = self.regen(wt, check_for_clean=True,
182
 
                            include_file_revisions=True)
183
152
        # This assumes it's being run against a tree that does not update the
184
153
        # root revision on every commit.
185
 
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
 
154
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
186
155
        self.assertEqual(['', 'a', 'b', 'c'], file_rev_stanza.get_all('path'))
187
156
        self.assertEqual(['r1', 'r3', 'r2', 'unversioned'],
188
 
                         file_rev_stanza.get_all('revision'))
 
157
            file_rev_stanza.get_all('revision'))
 
158
        os.remove('branch/c')
189
159
 
190
 
    def test_revision_history(self):
191
 
        wt = self.create_branch()
192
 
        stanza = self.regen(wt, include_revision_history=True)
193
 
        revision_stanza = self.get_one_stanza(stanza, 'revisions')
 
160
        stanza = regen(include_revision_history=True)
 
161
        revision_stanza = get_one_stanza(stanza, 'revisions')
194
162
        self.assertEqual(['r1', 'r2', 'r3'], revision_stanza.get_all('id'))
195
 
        self.assertEqual(['a', 'b', u'\xe52'],
196
 
                         revision_stanza.get_all('message'))
 
163
        self.assertEqual(['a', 'b', u'\xe52'], revision_stanza.get_all('message'))
197
164
        self.assertEqual(3, len(revision_stanza.get_all('date')))
198
165
 
199
 
    def test_file_revisions_with_rename(self):
200
166
        # a was modified, so it should show up modified again
201
 
        wt = self.create_branch()
202
167
        self.build_tree(['branch/a', 'branch/c'])
203
168
        wt.add('c')
204
169
        wt.rename_one('b', 'd')
205
 
        stanza = self.regen(wt, check_for_clean=True,
206
 
                            include_file_revisions=True)
207
 
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
 
170
        stanza = regen(check_for_clean=True, include_file_revisions=True)
 
171
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
208
172
        self.assertEqual(['', 'a', 'b', 'c', 'd'],
209
 
                         file_rev_stanza.get_all('path'))
 
173
                          file_rev_stanza.get_all('path'))
210
174
        self.assertEqual(['r1', 'modified', 'renamed to d', 'new',
211
175
                          'renamed from b'],
212
176
                         file_rev_stanza.get_all('revision'))
213
177
 
214
 
    def test_file_revisions_with_removal(self):
215
 
        wt = self.create_branch()
216
 
        self.build_tree(['branch/a', 'branch/c'])
217
 
        wt.add('c')
218
 
        wt.rename_one('b', 'd')
219
 
 
220
 
        wt.commit('modified', rev_id=b'r4')
221
 
 
 
178
        wt.commit('modified', rev_id='r4')
222
179
        wt.remove(['c', 'd'])
223
180
        os.remove('branch/d')
224
 
        stanza = self.regen(wt, check_for_clean=True,
225
 
                            include_file_revisions=True)
226
 
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
 
181
        stanza = regen(check_for_clean=True, include_file_revisions=True)
 
182
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
227
183
        self.assertEqual(['', 'a', 'c', 'd'], file_rev_stanza.get_all('path'))
228
184
        self.assertEqual(['r1', 'r4', 'unversioned', 'removed'],
229
185
                         file_rev_stanza.get_all('revision'))
230
186
 
231
 
    def test_revision(self):
232
 
        wt = self.create_branch()
233
 
        self.build_tree(['branch/a', 'branch/c'])
234
 
        wt.add('c')
235
 
        wt.rename_one('b', 'd')
236
 
 
237
 
        stanza = self.regen(
238
 
            wt, check_for_clean=True, include_file_revisions=True,
239
 
            revision_id=wt.last_revision())
240
 
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
241
 
        self.assertEqual(['', 'a', 'b'], file_rev_stanza.get_all('path'))
242
 
        self.assertEqual(['r1', 'r3', 'r2'],
243
 
                         file_rev_stanza.get_all('revision'))
244
 
 
245
 
 
246
 
class PythonVersionInfoTests(VersionInfoTestCase):
247
 
 
248
187
    def test_python_null(self):
249
188
        wt = self.make_branch_and_tree('branch')
250
189
 
253
192
        builder.generate(sio)
254
193
        val = sio.getvalue()
255
194
        self.assertContainsRe(val, "'revision_id': None")
256
 
        self.assertContainsRe(val, "'revno': '0'")
257
 
        self.assertNotContainsString(val, '\n\n\n\n')
258
 
 
259
 
    def test_python_dotted_revno(self):
260
 
        wt = self.create_tree_with_dotted_revno()
261
 
 
262
 
        sio = StringIO()
263
 
        builder = PythonVersionInfoBuilder(wt.branch, working_tree=wt)
264
 
        builder.generate(sio)
265
 
        val = sio.getvalue()
266
 
        self.assertContainsRe(val, "'revno': '1.1.1'")
267
 
 
268
 
    def regen(self, wt, **kwargs):
269
 
        """Create a test module, import and return it"""
270
 
        builder = PythonVersionInfoBuilder(wt.branch, working_tree=wt,
271
 
                                           **kwargs)
272
 
        outf = StringIO()
273
 
        builder.generate(outf)
274
 
        local_vars = {}
275
 
        exec(outf.getvalue(), {}, local_vars)
276
 
        return local_vars
 
195
        self.assertContainsRe(val, "'revno': 0")
277
196
 
278
197
    def test_python_version(self):
279
198
        wt = self.create_branch()
280
199
 
281
 
        tvi = self.regen(wt)
282
 
        self.assertEqual('3', tvi['version_info']['revno'])
283
 
        self.assertEqual(b'r3', tvi['version_info']['revision_id'])
284
 
        self.assertTrue('date' in tvi['version_info'])
285
 
        self.assertEqual(None, tvi['version_info']['clean'])
286
 
 
287
 
        tvi = self.regen(wt, check_for_clean=True)
288
 
        self.assertTrue(tvi['version_info']['clean'])
 
200
        def regen(**kwargs):
 
201
            """Create a test module, import and return it"""
 
202
            outf = open('test_version_information.py', 'wb')
 
203
            try:
 
204
                builder = PythonVersionInfoBuilder(wt.branch, working_tree=wt,
 
205
                                                   **kwargs)
 
206
                builder.generate(outf)
 
207
            finally:
 
208
                outf.close()
 
209
            module_info = imp.find_module('test_version_information',
 
210
                                          [os.getcwdu()])
 
211
            tvi = imp.load_module('tvi', *module_info)
 
212
            # Make sure the module isn't cached
 
213
            sys.modules.pop('tvi', None)
 
214
            sys.modules.pop('test_version_information', None)
 
215
            # Delete the compiled versions, because we are generating
 
216
            # a new file fast enough that python doesn't detect it
 
217
            # needs to recompile, and using sleep() just makes the
 
218
            # test slow
 
219
            if os.path.exists('test_version_information.pyc'):
 
220
                os.remove('test_version_information.pyc')
 
221
            if os.path.exists('test_version_information.pyo'):
 
222
                os.remove('test_version_information.pyo')
 
223
            return tvi
 
224
 
 
225
        tvi = regen()
 
226
        self.assertEqual(3, tvi.version_info['revno'])
 
227
        self.assertEqual('r3', tvi.version_info['revision_id'])
 
228
        self.failUnless(tvi.version_info.has_key('date'))
 
229
        self.assertEqual(None, tvi.version_info['clean'])
 
230
 
 
231
        tvi = regen(check_for_clean=True)
 
232
        self.assertEqual(True, tvi.version_info['clean'])
289
233
 
290
234
        self.build_tree(['branch/c'])
291
 
        tvi = self.regen(wt, check_for_clean=True, include_file_revisions=True)
292
 
        self.assertFalse(tvi['version_info']['clean'])
 
235
        tvi = regen(check_for_clean=True, include_file_revisions=True)
 
236
        self.assertEqual(False, tvi.version_info['clean'])
293
237
        self.assertEqual(['', 'a', 'b', 'c'],
294
 
                         sorted(tvi['file_revisions'].keys()))
295
 
        self.assertEqual(b'r3', tvi['file_revisions']['a'])
296
 
        self.assertEqual(b'r2', tvi['file_revisions']['b'])
297
 
        self.assertEqual('unversioned', tvi['file_revisions']['c'])
 
238
                         sorted(tvi.file_revisions.keys()))
 
239
        self.assertEqual('r3', tvi.file_revisions['a'])
 
240
        self.assertEqual('r2', tvi.file_revisions['b'])
 
241
        self.assertEqual('unversioned', tvi.file_revisions['c'])
298
242
        os.remove('branch/c')
299
243
 
300
 
        tvi = self.regen(wt, include_revision_history=True)
 
244
        tvi = regen(include_revision_history=True)
301
245
 
302
246
        rev_info = [(rev, message) for rev, message, timestamp, timezone
303
 
                    in tvi['revisions']]
304
 
        self.assertEqual([(b'r1', 'a'), (b'r2', 'b'),
305
 
                          (b'r3', u'\xe52')], rev_info)
 
247
                                   in tvi.revisions]
 
248
        self.assertEqual([('r1', 'a'), ('r2', 'b'), ('r3', u'\xe52')], rev_info)
306
249
 
307
250
        # a was modified, so it should show up modified again
308
251
        self.build_tree(['branch/a', 'branch/c'])
309
252
        wt.add('c')
310
253
        wt.rename_one('b', 'd')
311
 
        tvi = self.regen(wt, check_for_clean=True, include_file_revisions=True)
 
254
        tvi = regen(check_for_clean=True, include_file_revisions=True)
312
255
        self.assertEqual(['', 'a', 'b', 'c', 'd'],
313
 
                         sorted(tvi['file_revisions'].keys()))
314
 
        self.assertEqual('modified', tvi['file_revisions']['a'])
315
 
        self.assertEqual('renamed to d', tvi['file_revisions']['b'])
316
 
        self.assertEqual('new', tvi['file_revisions']['c'])
317
 
        self.assertEqual('renamed from b', tvi['file_revisions']['d'])
 
256
                          sorted(tvi.file_revisions.keys()))
 
257
        self.assertEqual('modified', tvi.file_revisions['a'])
 
258
        self.assertEqual('renamed to d', tvi.file_revisions['b'])
 
259
        self.assertEqual('new', tvi.file_revisions['c'])
 
260
        self.assertEqual('renamed from b', tvi.file_revisions['d'])
318
261
 
319
 
        wt.commit('modified', rev_id=b'r4')
 
262
        wt.commit('modified', rev_id='r4')
320
263
        wt.remove(['c', 'd'])
321
264
        os.remove('branch/d')
322
 
        tvi = self.regen(wt, check_for_clean=True, include_file_revisions=True)
 
265
        tvi = regen(check_for_clean=True, include_file_revisions=True)
323
266
        self.assertEqual(['', 'a', 'c', 'd'],
324
 
                         sorted(tvi['file_revisions'].keys()))
325
 
        self.assertEqual(b'r4', tvi['file_revisions']['a'])
326
 
        self.assertEqual('unversioned', tvi['file_revisions']['c'])
327
 
        self.assertEqual('removed', tvi['file_revisions']['d'])
328
 
 
329
 
 
330
 
class CustomVersionInfoTests(VersionInfoTestCase):
 
267
                          sorted(tvi.file_revisions.keys()))
 
268
        self.assertEqual('r4', tvi.file_revisions['a'])
 
269
        self.assertEqual('unversioned', tvi.file_revisions['c'])
 
270
        self.assertEqual('removed', tvi.file_revisions['d'])
331
271
 
332
272
    def test_custom_null(self):
333
273
        sio = StringIO()
334
274
        wt = self.make_branch_and_tree('branch')
335
275
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt,
336
 
                                           template='revno: {revno}')
 
276
            template='revno: {revno}')
337
277
        builder.generate(sio)
338
 
        self.assertEqual("revno: 0", sio.getvalue())
 
278
        self.assertEquals("revno: 0", sio.getvalue())
339
279
 
340
 
        builder = CustomVersionInfoBuilder(
341
 
            wt.branch, working_tree=wt,
 
280
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt, 
342
281
            template='{revno} revid: {revision_id}')
343
282
        # revision_id is not available yet
344
 
        self.assertRaises(MissingTemplateVariable, builder.generate, sio)
345
 
 
346
 
    def test_custom_dotted_revno(self):
347
 
        sio = StringIO()
348
 
        wt = self.create_tree_with_dotted_revno()
349
 
        builder = CustomVersionInfoBuilder(
350
 
            wt.branch, working_tree=wt,
351
 
            template='{revno} revid: {revision_id}')
352
 
        builder.generate(sio)
353
 
        self.assertEqual("1.1.1 revid: o2", sio.getvalue())
354
 
 
355
 
    def regen(self, wt, tpl, **kwargs):
356
 
        sio = StringIO()
357
 
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt,
358
 
                                           template=tpl, **kwargs)
359
 
        builder.generate(sio)
360
 
        val = sio.getvalue()
361
 
        return val
362
 
 
363
 
    def test_build_date(self):
 
283
        self.assertRaises(errors.MissingTemplateVariable, 
 
284
            builder.generate, sio)
 
285
 
 
286
    def test_custom_version_text(self):
364
287
        wt = self.create_branch()
365
288
 
366
 
        val = self.regen(wt, 'build-date: "{build_date}"\ndate: "{date}"')
 
289
        def regen(tpl, **kwargs):
 
290
            sio = StringIO()
 
291
            builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt,
 
292
                                               template=tpl, **kwargs)
 
293
            builder.generate(sio)
 
294
            val = sio.getvalue()
 
295
            return val
 
296
 
 
297
        val = regen('build-date: "{build_date}"\ndate: "{date}"')
367
298
        self.assertContainsRe(val, 'build-date: "[0-9-+: ]+"')
368
299
        self.assertContainsRe(val, 'date: "[0-9-+: ]+"')
369
300
 
370
 
    def test_revno(self):
371
 
        wt = self.create_branch()
372
 
        val = self.regen(wt, 'revno: {revno}')
 
301
        val = regen('revno: {revno}')
373
302
        self.assertEqual(val, 'revno: 3')
374
303
 
375
 
    def test_revision_id(self):
376
 
        wt = self.create_branch()
377
 
        val = self.regen(wt, 'revision-id: {revision_id}')
 
304
        val = regen('revision-id: {revision_id}')
378
305
        self.assertEqual(val, 'revision-id: r3')
379
306
 
380
 
    def test_clean(self):
381
 
        wt = self.create_branch()
382
 
        val = self.regen(wt, 'clean: {clean}', check_for_clean=True)
 
307
        val = regen('clean: {clean}', check_for_clean=True)
383
308
        self.assertEqual(val, 'clean: 1')
384
309
 
385
 
    def test_not_clean(self):
386
 
        wt = self.create_branch()
387
 
 
388
310
        self.build_tree(['branch/c'])
389
 
        val = self.regen(wt, 'clean: {clean}', check_for_clean=True)
 
311
        val = regen('clean: {clean}', check_for_clean=True)
390
312
        self.assertEqual(val, 'clean: 0')
391
313
        os.remove('branch/c')
392
314
 
393
315
    def test_custom_without_template(self):
394
316
        builder = CustomVersionInfoBuilder(None)
395
317
        sio = StringIO()
396
 
        self.assertRaises(NoTemplate, builder.generate, sio)
 
318
        self.assertRaises(errors.NoTemplate, builder.generate, sio)
397
319
 
398
320
 
399
321
class TestBuilder(version_info_formats.VersionInfoBuilder):
410
332
    def test_register_remove(self):
411
333
        registry = version_info_formats.format_registry
412
334
        registry.register('testbuilder',
413
 
                          TestBuilder, 'a simple test builder')
 
335
            TestBuilder, 'a simple test builder')
414
336
        self.assertIs(TestBuilder, registry.get('testbuilder'))
415
337
        self.assertEqual('a simple test builder',
416
338
                         registry.get_help('testbuilder'))