/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_bundle.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 23:11:39 UTC
  • mfrom: (6973.12.13 python3-k)
  • Revision ID: breezy.the.bot@gmail.com-20180630231139-tf5t5khh6bu5ntpm
Fix some more tests on python3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-k/+merge/348646

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
1003
1003
        tree.lock_write()
1004
1004
        self.addCleanup(tree.unlock)
1005
1005
        tree.add([''], [b'TREE_ROOT'])
1006
 
        tree.commit('One', revprops={'one': 'two', 'empty': ''}, rev_id=b'rev1')
 
1006
        tree.commit('One', revprops={u'one': 'two', u'empty': ''}, rev_id=b'rev1')
1007
1007
        self.b1 = tree.branch
1008
1008
        bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1009
1009
        bundle = read_bundle(bundle_sio)
1021
1021
 
1022
1022
        tree.add([''], [b'TREE_ROOT'])
1023
1023
        tree.commit('One', rev_id=b'rev1',
1024
 
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
 
1024
                    revprops={u'a':'4', u'b':'3', u'c':'2', u'd':'1'})
1025
1025
        self.b1 = tree.branch
1026
1026
        bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1027
1027
        bundle = read_bundle(bundle_sio)
1044
1044
        # However, Testaments assert than they are str(), and thus should not
1045
1045
        # be Unicode.
1046
1046
        tree.commit('One', rev_id=b'rev1',
1047
 
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
 
1047
                    revprops={u'omega':u'\u03a9', u'alpha':u'\u03b1'})
1048
1048
        self.b1 = tree.branch
1049
1049
        bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1050
1050
        bundle = read_bundle(bundle_sio)
1200
1200
        tree.lock_write()
1201
1201
        self.addCleanup(tree.unlock)
1202
1202
        tree.add([''], [b'TREE_ROOT'])
1203
 
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id=b'rev1')
 
1203
        tree.commit('One', revprops={u'one':'two', u'empty':''}, rev_id=b'rev1')
1204
1204
        self.b1 = tree.branch
1205
1205
        bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1206
1206
        self.assertContainsRe(bundle_sio.getvalue(),
1232
1232
        tree.lock_write()
1233
1233
        self.addCleanup(tree.unlock)
1234
1234
        tree.add([''], [b'TREE_ROOT'])
1235
 
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id=b'rev1')
 
1235
        tree.commit('One', revprops={u'one':'two', u'empty':''}, rev_id=b'rev1')
1236
1236
        self.b1 = tree.branch
1237
1237
        bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1238
1238
        txt = bundle_sio.getvalue()
1261
1261
 
1262
1262
        tree.add([''], [b'TREE_ROOT'])
1263
1263
        tree.commit('One', rev_id=b'rev1',
1264
 
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
 
1264
                    revprops={u'a':'4', u'b':'3', u'c':'2', u'd':'1'})
1265
1265
        self.b1 = tree.branch
1266
1266
        bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1267
1267
        self.assertContainsRe(bundle_sio.getvalue(),
1292
1292
        # However, Testaments assert than they are str(), and thus should not
1293
1293
        # be Unicode.
1294
1294
        tree.commit('One', rev_id=b'rev1',
1295
 
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
 
1295
                    revprops={u'omega':u'\u03a9', u'alpha':u'\u03b1'})
1296
1296
        self.b1 = tree.branch
1297
1297
        bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1298
1298
        self.assertContainsRe(bundle_sio.getvalue(),
1687
1687
        self.build_tree(['b1/two'])
1688
1688
        wt.add('two')
1689
1689
        wt.commit('add two', rev_id=b'a@cset-0-2',
1690
 
                  revprops={'branch-nick':'test'})
 
1690
                  revprops={u'branch-nick':'test'})
1691
1691
 
1692
1692
        bundle_txt = BytesIO()
1693
1693
        rev_ids = write_bundle(wt.branch.repository, b'a@cset-0-2',