/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: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_version_info.py
46
46
 
47
47
        self.build_tree(['branch/a'])
48
48
        wt.add('a')
49
 
        wt.commit('a', rev_id=b'r1')
 
49
        wt.commit('a', rev_id='r1')
50
50
 
51
51
        self.build_tree(['branch/b'])
52
52
        wt.add('b')
53
 
        wt.commit('b', rev_id=b'r2')
 
53
        wt.commit('b', rev_id='r2')
54
54
 
55
 
        self.build_tree_contents([('branch/a', b'new contents\n')])
56
 
        wt.commit(u'\xe52', rev_id=b'r3')
 
55
        self.build_tree_contents([('branch/a', 'new contents\n')])
 
56
        wt.commit(u'\xe52', rev_id='r3')
57
57
 
58
58
        return wt
59
59
 
61
61
        wt = self.make_branch_and_tree('branch')
62
62
        self.build_tree(['branch/a'])
63
63
        wt.add('a')
64
 
        wt.commit('a', rev_id=b'r1')
 
64
        wt.commit('a', rev_id='r1')
65
65
 
66
66
        other = wt.controldir.sprout('other').open_workingtree()
67
67
        self.build_tree(['other/b.a'])
68
68
        other.add(['b.a'])
69
 
        other.commit('b.a', rev_id=b'o2')
 
69
        other.commit('b.a', rev_id='o2')
70
70
 
71
71
        os.chdir('branch')
72
72
        self.run_bzr('merge ../other')
73
 
        wt.commit('merge', rev_id=b'merge')
 
73
        wt.commit('merge', rev_id='merge')
74
74
 
75
75
        wt.update(revision='o2')
76
76
 
213
213
        wt.add('c')
214
214
        wt.rename_one('b', 'd')
215
215
 
216
 
        wt.commit('modified', rev_id=b'r4')
 
216
        wt.commit('modified', rev_id='r4')
217
217
 
218
218
        wt.remove(['c', 'd'])
219
219
        os.remove('branch/d')
261
261
 
262
262
    def regen(self, wt, **kwargs):
263
263
        """Create a test module, import and return it"""
264
 
        with open('test_version_information.py', 'wb') as outf:
 
264
        outf = open('test_version_information.py', 'wb')
 
265
        try:
265
266
            builder = PythonVersionInfoBuilder(wt.branch, working_tree=wt,
266
267
                                               **kwargs)
267
268
            builder.generate(outf)
 
269
        finally:
 
270
            outf.close()
268
271
        import imp
269
272
        module_info = imp.find_module('test_version_information',
270
273
                                      [self.test_dir])
322
325
        self.assertEqual('new', tvi.file_revisions['c'])
323
326
        self.assertEqual('renamed from b', tvi.file_revisions['d'])
324
327
 
325
 
        wt.commit('modified', rev_id=b'r4')
 
328
        wt.commit('modified', rev_id='r4')
326
329
        wt.remove(['c', 'd'])
327
330
        os.remove('branch/d')
328
331
        tvi = self.regen(wt, check_for_clean=True, include_file_revisions=True)