/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 brzlib/tests/test_version_info.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/test_version_info.py
16
16
 
17
17
"""Tests for version_info"""
18
18
 
19
 
from io import (
20
 
    BytesIO,
21
 
    StringIO,
22
 
    )
 
19
from cStringIO import StringIO
 
20
import imp
23
21
import os
 
22
import sys
24
23
 
25
 
from .. import (
 
24
from brzlib import (
 
25
    errors,
26
26
    registry,
27
27
    tests,
28
28
    version_info_formats,
29
29
    )
30
 
from . import TestCaseWithTransport
31
 
from ..rio import read_stanzas, read_stanzas_unicode
 
30
from brzlib.tests import TestCaseWithTransport
 
31
from brzlib.rio import read_stanzas
32
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
 
33
from brzlib.version_info_formats.format_custom import CustomVersionInfoBuilder
 
34
from brzlib.version_info_formats.format_rio import RioVersionInfoBuilder
 
35
from brzlib.version_info_formats.format_python import PythonVersionInfoBuilder
40
36
 
41
37
 
42
38
class VersionInfoTestCase(TestCaseWithTransport):
46
42
 
47
43
        self.build_tree(['branch/a'])
48
44
        wt.add('a')
49
 
        wt.commit('a', rev_id=b'r1')
 
45
        wt.commit('a', rev_id='r1')
50
46
 
51
47
        self.build_tree(['branch/b'])
52
48
        wt.add('b')
53
 
        wt.commit('b', rev_id=b'r2')
 
49
        wt.commit('b', rev_id='r2')
54
50
 
55
 
        self.build_tree_contents([('branch/a', b'new contents\n')])
56
 
        wt.commit(u'\xe52', rev_id=b'r3')
 
51
        self.build_tree_contents([('branch/a', 'new contents\n')])
 
52
        wt.commit(u'\xe52', rev_id='r3')
57
53
 
58
54
        return wt
59
55
 
61
57
        wt = self.make_branch_and_tree('branch')
62
58
        self.build_tree(['branch/a'])
63
59
        wt.add('a')
64
 
        wt.commit('a', rev_id=b'r1')
 
60
        wt.commit('a', rev_id='r1')
65
61
 
66
 
        other = wt.controldir.sprout('other').open_workingtree()
 
62
        other = wt.bzrdir.sprout('other').open_workingtree()
67
63
        self.build_tree(['other/b.a'])
68
64
        other.add(['b.a'])
69
 
        other.commit('b.a', rev_id=b'o2')
 
65
        other.commit('b.a', rev_id='o2')
70
66
 
71
67
        os.chdir('branch')
72
68
        self.run_bzr('merge ../other')
73
 
        wt.commit('merge', rev_id=b'merge')
 
69
        wt.commit('merge', rev_id='merge')
74
70
 
75
 
        wt.update(revision=b'o2')
 
71
        wt.update(revision='o2')
76
72
 
77
73
        return wt
78
74
 
134
130
        self.assertContainsRe(val, 'id: r2')
135
131
        self.assertContainsRe(val, 'message: b')
136
132
        self.assertContainsRe(val, 'id: r3')
137
 
        self.assertContainsRe(val, 'message: \xe5')
 
133
        self.assertContainsRe(val, 'message: \xc3\xa52') # utf8 encoding '\xe5'
138
134
 
139
135
    def regen(self, wt, **kwargs):
140
136
        sio = StringIO()
141
137
        builder = RioVersionInfoBuilder(wt.branch, working_tree=wt, **kwargs)
142
138
        builder.generate(sio)
143
139
        sio.seek(0)
144
 
        stanzas = list(read_stanzas_unicode(sio))
 
140
        stanzas = list(read_stanzas(sio))
145
141
        self.assertEqual(1, len(stanzas))
146
142
        return stanzas[0]
147
143
 
156
152
        self.assertEqual(['bloe'], stanza.get_all('bla'))
157
153
 
158
154
    def get_one_stanza(self, stanza, key):
159
 
        new_stanzas = list(read_stanzas(BytesIO(stanza[key].encode('utf8'))))
 
155
        new_stanzas = list(read_stanzas(StringIO(stanza[key].encode('utf8'))))
160
156
        self.assertEqual(1, len(new_stanzas))
161
157
        return new_stanzas[0]
162
158
 
171
167
    def test_not_clean(self):
172
168
        wt = self.create_branch()
173
169
        self.build_tree(['branch/c'])
174
 
        stanza = self.regen(wt, check_for_clean=True,
175
 
                            include_file_revisions=True)
 
170
        stanza = self.regen(wt, check_for_clean=True, include_file_revisions=True)
176
171
        self.assertEqual(['False'], stanza.get_all('clean'))
177
172
 
178
173
    def test_file_revisions(self):
179
174
        wt = self.create_branch()
180
175
        self.build_tree(['branch/c'])
181
 
        stanza = self.regen(wt, check_for_clean=True,
182
 
                            include_file_revisions=True)
 
176
        stanza = self.regen(wt, check_for_clean=True, include_file_revisions=True)
183
177
        # This assumes it's being run against a tree that does not update the
184
178
        # root revision on every commit.
185
179
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
186
180
        self.assertEqual(['', 'a', 'b', 'c'], file_rev_stanza.get_all('path'))
187
181
        self.assertEqual(['r1', 'r3', 'r2', 'unversioned'],
188
 
                         file_rev_stanza.get_all('revision'))
 
182
            file_rev_stanza.get_all('revision'))
189
183
 
190
184
    def test_revision_history(self):
191
185
        wt = self.create_branch()
192
186
        stanza = self.regen(wt, include_revision_history=True)
193
187
        revision_stanza = self.get_one_stanza(stanza, 'revisions')
194
188
        self.assertEqual(['r1', 'r2', 'r3'], revision_stanza.get_all('id'))
195
 
        self.assertEqual(['a', 'b', u'\xe52'],
196
 
                         revision_stanza.get_all('message'))
 
189
        self.assertEqual(['a', 'b', u'\xe52'], revision_stanza.get_all('message'))
197
190
        self.assertEqual(3, len(revision_stanza.get_all('date')))
198
191
 
199
192
    def test_file_revisions_with_rename(self):
202
195
        self.build_tree(['branch/a', 'branch/c'])
203
196
        wt.add('c')
204
197
        wt.rename_one('b', 'd')
205
 
        stanza = self.regen(wt, check_for_clean=True,
206
 
                            include_file_revisions=True)
 
198
        stanza = self.regen(wt, check_for_clean=True, include_file_revisions=True)
207
199
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
208
200
        self.assertEqual(['', 'a', 'b', 'c', 'd'],
209
 
                         file_rev_stanza.get_all('path'))
 
201
                          file_rev_stanza.get_all('path'))
210
202
        self.assertEqual(['r1', 'modified', 'renamed to d', 'new',
211
203
                          'renamed from b'],
212
204
                         file_rev_stanza.get_all('revision'))
217
209
        wt.add('c')
218
210
        wt.rename_one('b', 'd')
219
211
 
220
 
        wt.commit('modified', rev_id=b'r4')
 
212
        wt.commit('modified', rev_id='r4')
221
213
 
222
214
        wt.remove(['c', 'd'])
223
215
        os.remove('branch/d')
224
 
        stanza = self.regen(wt, check_for_clean=True,
225
 
                            include_file_revisions=True)
 
216
        stanza = self.regen(wt, check_for_clean=True, include_file_revisions=True)
226
217
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
227
218
        self.assertEqual(['', 'a', 'c', 'd'], file_rev_stanza.get_all('path'))
228
219
        self.assertEqual(['r1', 'r4', 'unversioned', 'removed'],
234
225
        wt.add('c')
235
226
        wt.rename_one('b', 'd')
236
227
 
237
 
        stanza = self.regen(
238
 
            wt, check_for_clean=True, include_file_revisions=True,
239
 
            revision_id=wt.last_revision())
 
228
        stanza = self.regen(wt, check_for_clean=True,
 
229
            include_file_revisions=True, revision_id=wt.last_revision())
240
230
        file_rev_stanza = self.get_one_stanza(stanza, 'file-revisions')
241
231
        self.assertEqual(['', 'a', 'b'], file_rev_stanza.get_all('path'))
242
232
        self.assertEqual(['r1', 'r3', 'r2'],
267
257
 
268
258
    def regen(self, wt, **kwargs):
269
259
        """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
 
260
        outf = open('test_version_information.py', 'wb')
 
261
        try:
 
262
            builder = PythonVersionInfoBuilder(wt.branch, working_tree=wt,
 
263
                                               **kwargs)
 
264
            builder.generate(outf)
 
265
        finally:
 
266
            outf.close()
 
267
        module_info = imp.find_module('test_version_information',
 
268
                                      [os.getcwdu()])
 
269
        tvi = imp.load_module('tvi', *module_info)
 
270
        # Make sure the module isn't cached
 
271
        sys.modules.pop('tvi', None)
 
272
        sys.modules.pop('test_version_information', None)
 
273
        # Delete the compiled versions, because we are generating
 
274
        # a new file fast enough that python doesn't detect it
 
275
        # needs to recompile, and using sleep() just makes the
 
276
        # test slow
 
277
        if os.path.exists('test_version_information.pyc'):
 
278
            os.remove('test_version_information.pyc')
 
279
        if os.path.exists('test_version_information.pyo'):
 
280
            os.remove('test_version_information.pyo')
 
281
        return tvi
277
282
 
278
283
    def test_python_version(self):
279
284
        wt = self.create_branch()
280
285
 
281
286
        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'])
 
287
        self.assertEqual('3', tvi.version_info['revno'])
 
288
        self.assertEqual('r3', tvi.version_info['revision_id'])
 
289
        self.assertTrue(tvi.version_info.has_key('date'))
 
290
        self.assertEqual(None, tvi.version_info['clean'])
286
291
 
287
292
        tvi = self.regen(wt, check_for_clean=True)
288
 
        self.assertTrue(tvi['version_info']['clean'])
 
293
        self.assertEqual(True, tvi.version_info['clean'])
289
294
 
290
295
        self.build_tree(['branch/c'])
291
296
        tvi = self.regen(wt, check_for_clean=True, include_file_revisions=True)
292
 
        self.assertFalse(tvi['version_info']['clean'])
 
297
        self.assertEqual(False, tvi.version_info['clean'])
293
298
        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'])
 
299
                         sorted(tvi.file_revisions.keys()))
 
300
        self.assertEqual('r3', tvi.file_revisions['a'])
 
301
        self.assertEqual('r2', tvi.file_revisions['b'])
 
302
        self.assertEqual('unversioned', tvi.file_revisions['c'])
298
303
        os.remove('branch/c')
299
304
 
300
305
        tvi = self.regen(wt, include_revision_history=True)
301
306
 
302
307
        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)
 
308
                                   in tvi.revisions]
 
309
        self.assertEqual([('r1', 'a'), ('r2', 'b'), ('r3', u'\xe52')], rev_info)
306
310
 
307
311
        # a was modified, so it should show up modified again
308
312
        self.build_tree(['branch/a', 'branch/c'])
310
314
        wt.rename_one('b', 'd')
311
315
        tvi = self.regen(wt, check_for_clean=True, include_file_revisions=True)
312
316
        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'])
 
317
                          sorted(tvi.file_revisions.keys()))
 
318
        self.assertEqual('modified', tvi.file_revisions['a'])
 
319
        self.assertEqual('renamed to d', tvi.file_revisions['b'])
 
320
        self.assertEqual('new', tvi.file_revisions['c'])
 
321
        self.assertEqual('renamed from b', tvi.file_revisions['d'])
318
322
 
319
 
        wt.commit('modified', rev_id=b'r4')
 
323
        wt.commit('modified', rev_id='r4')
320
324
        wt.remove(['c', 'd'])
321
325
        os.remove('branch/d')
322
326
        tvi = self.regen(wt, check_for_clean=True, include_file_revisions=True)
323
327
        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
                          sorted(tvi.file_revisions.keys()))
 
329
        self.assertEqual('r4', tvi.file_revisions['a'])
 
330
        self.assertEqual('unversioned', tvi.file_revisions['c'])
 
331
        self.assertEqual('removed', tvi.file_revisions['d'])
328
332
 
329
333
 
330
334
class CustomVersionInfoTests(VersionInfoTestCase):
333
337
        sio = StringIO()
334
338
        wt = self.make_branch_and_tree('branch')
335
339
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt,
336
 
                                           template='revno: {revno}')
 
340
            template='revno: {revno}')
337
341
        builder.generate(sio)
338
342
        self.assertEqual("revno: 0", sio.getvalue())
339
343
 
340
 
        builder = CustomVersionInfoBuilder(
341
 
            wt.branch, working_tree=wt,
 
344
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt, 
342
345
            template='{revno} revid: {revision_id}')
343
346
        # revision_id is not available yet
344
 
        self.assertRaises(MissingTemplateVariable, builder.generate, sio)
 
347
        self.assertRaises(errors.MissingTemplateVariable, 
 
348
            builder.generate, sio)
345
349
 
346
350
    def test_custom_dotted_revno(self):
347
351
        sio = StringIO()
348
352
        wt = self.create_tree_with_dotted_revno()
349
 
        builder = CustomVersionInfoBuilder(
350
 
            wt.branch, working_tree=wt,
 
353
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt, 
351
354
            template='{revno} revid: {revision_id}')
352
355
        builder.generate(sio)
353
356
        self.assertEqual("1.1.1 revid: o2", sio.getvalue())
393
396
    def test_custom_without_template(self):
394
397
        builder = CustomVersionInfoBuilder(None)
395
398
        sio = StringIO()
396
 
        self.assertRaises(NoTemplate, builder.generate, sio)
 
399
        self.assertRaises(errors.NoTemplate, builder.generate, sio)
397
400
 
398
401
 
399
402
class TestBuilder(version_info_formats.VersionInfoBuilder):
410
413
    def test_register_remove(self):
411
414
        registry = version_info_formats.format_registry
412
415
        registry.register('testbuilder',
413
 
                          TestBuilder, 'a simple test builder')
 
416
            TestBuilder, 'a simple test builder')
414
417
        self.assertIs(TestBuilder, registry.get('testbuilder'))
415
418
        self.assertEqual('a simple test builder',
416
419
                         registry.get_help('testbuilder'))