~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_version_info.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

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