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

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

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