/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: Martin
  • Date: 2017-09-10 23:52:30 UTC
  • mto: This revision was merged to the branch mainline in revision 6789.
  • Revision ID: gzlist@googlemail.com-20170910235230-xzzqmm0l2locfjge
Make _rio_pyx compile and pass tests on Python 3

Show diffs side-by-side

added added

removed removed

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