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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 23:59:28 UTC
  • mfrom: (6973.6.4 python3-e)
  • Revision ID: jelmer@jelmer.uk-20180621235928-f7z0vf0lxc6ieo9e
Merge lp:~jelmer/brz/python3-e

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_inv.py
23
23
    tests,
24
24
    workingtree,
25
25
    )
 
26
from ..sixish import text_type
26
27
from ..bzr import (
27
28
    chk_map,
28
29
    groupcompress,
1228
1229
                         b'file-rev-id\nabcdefgh\n100\nY', bytes)
1229
1230
        ie2 = inv._bytes_to_entry(bytes)
1230
1231
        self.assertEqual(ie, ie2)
1231
 
        self.assertIsInstance(ie2.name, unicode)
 
1232
        self.assertIsInstance(ie2.name, text_type)
1232
1233
        self.assertEqual(('filename', b'file-id', b'file-rev-id'),
1233
1234
                         inv._bytes_to_utf8name_key(bytes))
1234
1235
 
1245
1246
                         b'file-rev-id\n123456\n25\nN', bytes)
1246
1247
        ie2 = inv._bytes_to_entry(bytes)
1247
1248
        self.assertEqual(ie, ie2)
1248
 
        self.assertIsInstance(ie2.name, unicode)
 
1249
        self.assertIsInstance(ie2.name, text_type)
1249
1250
        self.assertEqual((b'\xce\xa9name', b'file-id', b'file-rev-id'),
1250
1251
                         inv._bytes_to_utf8name_key(bytes))
1251
1252
 
1257
1258
        self.assertEqual(b'dir: dir-id\nparent-id\ndirname\ndir-rev-id', bytes)
1258
1259
        ie2 = inv._bytes_to_entry(bytes)
1259
1260
        self.assertEqual(ie, ie2)
1260
 
        self.assertIsInstance(ie2.name, unicode)
 
1261
        self.assertIsInstance(ie2.name, text_type)
1261
1262
        self.assertEqual(('dirname', b'dir-id', b'dir-rev-id'),
1262
1263
                         inv._bytes_to_utf8name_key(bytes))
1263
1264
 
1271
1272
                         b'dir-rev-id', bytes)
1272
1273
        ie2 = inv._bytes_to_entry(bytes)
1273
1274
        self.assertEqual(ie, ie2)
1274
 
        self.assertIsInstance(ie2.name, unicode)
 
1275
        self.assertIsInstance(ie2.name, text_type)
1275
1276
        self.assertIs(ie2.parent_id, None)
1276
1277
        self.assertEqual(('dir\xce\xa9name', b'dir-id', b'dir-rev-id'),
1277
1278
                         inv._bytes_to_utf8name_key(bytes))
1286
1287
                         'link-rev-id\ntarget/path', bytes)
1287
1288
        ie2 = inv._bytes_to_entry(bytes)
1288
1289
        self.assertEqual(ie, ie2)
1289
 
        self.assertIsInstance(ie2.name, unicode)
1290
 
        self.assertIsInstance(ie2.symlink_target, unicode)
 
1290
        self.assertIsInstance(ie2.name, text_type)
 
1291
        self.assertIsInstance(ie2.symlink_target, text_type)
1291
1292
        self.assertEqual(('linkname', 'link-id', 'link-rev-id'),
1292
1293
                         inv._bytes_to_utf8name_key(bytes))
1293
1294
 
1301
1302
                         'link-rev-id\ntarget/\xce\xa9path', bytes)
1302
1303
        ie2 = inv._bytes_to_entry(bytes)
1303
1304
        self.assertEqual(ie, ie2)
1304
 
        self.assertIsInstance(ie2.name, unicode)
1305
 
        self.assertIsInstance(ie2.symlink_target, unicode)
 
1305
        self.assertIsInstance(ie2.name, text_type)
 
1306
        self.assertIsInstance(ie2.symlink_target, text_type)
1306
1307
        self.assertEqual(('link\xce\xa9name', 'link-id', 'link-rev-id'),
1307
1308
                         inv._bytes_to_utf8name_key(bytes))
1308
1309
 
1317
1318
                         'tree-rev-id\nref-rev-id', bytes)
1318
1319
        ie2 = inv._bytes_to_entry(bytes)
1319
1320
        self.assertEqual(ie, ie2)
1320
 
        self.assertIsInstance(ie2.name, unicode)
 
1321
        self.assertIsInstance(ie2.name, text_type)
1321
1322
        self.assertEqual(('tree\xce\xa9name', 'tree-root-id', 'tree-rev-id'),
1322
1323
                         inv._bytes_to_utf8name_key(bytes))
1323
1324