/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

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
27
26
from ..bzr import (
28
27
    chk_map,
29
28
    groupcompress,
36
35
    InventoryFile,
37
36
    InventoryDirectory,
38
37
    InventoryEntry,
 
38
    InvalidEntryName,
39
39
    TreeReference,
40
40
    mutable_inventory_from_tree,
41
41
    )
696
696
class TestInventoryEntry(TestCase):
697
697
 
698
698
    def test_file_invalid_entry_name(self):
699
 
        self.assertRaises(errors.InvalidEntryName, inventory.InventoryFile,
 
699
        self.assertRaises(InvalidEntryName, inventory.InventoryFile,
700
700
                          b'123', 'a/hello.c', ROOT_ID)
701
701
 
702
702
    def test_file_backslash(self):
1234
1234
                         b'file-rev-id\nabcdefgh\n100\nY', bytes)
1235
1235
        ie2 = inv._bytes_to_entry(bytes)
1236
1236
        self.assertEqual(ie, ie2)
1237
 
        self.assertIsInstance(ie2.name, text_type)
 
1237
        self.assertIsInstance(ie2.name, str)
1238
1238
        self.assertEqual((b'filename', b'file-id', b'file-rev-id'),
1239
1239
                         inv._bytes_to_utf8name_key(bytes))
1240
1240
 
1251
1251
                         b'file-rev-id\n123456\n25\nN', bytes)
1252
1252
        ie2 = inv._bytes_to_entry(bytes)
1253
1253
        self.assertEqual(ie, ie2)
1254
 
        self.assertIsInstance(ie2.name, text_type)
 
1254
        self.assertIsInstance(ie2.name, str)
1255
1255
        self.assertEqual((b'\xce\xa9name', b'file-id', b'file-rev-id'),
1256
1256
                         inv._bytes_to_utf8name_key(bytes))
1257
1257
 
1263
1263
        self.assertEqual(b'dir: dir-id\nparent-id\ndirname\ndir-rev-id', bytes)
1264
1264
        ie2 = inv._bytes_to_entry(bytes)
1265
1265
        self.assertEqual(ie, ie2)
1266
 
        self.assertIsInstance(ie2.name, text_type)
 
1266
        self.assertIsInstance(ie2.name, str)
1267
1267
        self.assertEqual((b'dirname', b'dir-id', b'dir-rev-id'),
1268
1268
                         inv._bytes_to_utf8name_key(bytes))
1269
1269
 
1277
1277
                         b'dir-rev-id', bytes)
1278
1278
        ie2 = inv._bytes_to_entry(bytes)
1279
1279
        self.assertEqual(ie, ie2)
1280
 
        self.assertIsInstance(ie2.name, text_type)
 
1280
        self.assertIsInstance(ie2.name, str)
1281
1281
        self.assertIs(ie2.parent_id, None)
1282
1282
        self.assertEqual((b'dir\xce\xa9name', b'dir-id', b'dir-rev-id'),
1283
1283
                         inv._bytes_to_utf8name_key(bytes))
1292
1292
                         b'link-rev-id\ntarget/path', bytes)
1293
1293
        ie2 = inv._bytes_to_entry(bytes)
1294
1294
        self.assertEqual(ie, ie2)
1295
 
        self.assertIsInstance(ie2.name, text_type)
1296
 
        self.assertIsInstance(ie2.symlink_target, text_type)
 
1295
        self.assertIsInstance(ie2.name, str)
 
1296
        self.assertIsInstance(ie2.symlink_target, str)
1297
1297
        self.assertEqual((b'linkname', b'link-id', b'link-rev-id'),
1298
1298
                         inv._bytes_to_utf8name_key(bytes))
1299
1299
 
1308
1308
                         b'link-rev-id\ntarget/\xce\xa9path', bytes)
1309
1309
        ie2 = inv._bytes_to_entry(bytes)
1310
1310
        self.assertEqual(ie, ie2)
1311
 
        self.assertIsInstance(ie2.name, text_type)
1312
 
        self.assertIsInstance(ie2.symlink_target, text_type)
 
1311
        self.assertIsInstance(ie2.name, str)
 
1312
        self.assertIsInstance(ie2.symlink_target, str)
1313
1313
        self.assertEqual((b'link\xce\xa9name', b'link-id', b'link-rev-id'),
1314
1314
                         inv._bytes_to_utf8name_key(bytes))
1315
1315
 
1324
1324
                         b'tree-rev-id\nref-rev-id', bytes)
1325
1325
        ie2 = inv._bytes_to_entry(bytes)
1326
1326
        self.assertEqual(ie, ie2)
1327
 
        self.assertIsInstance(ie2.name, text_type)
 
1327
        self.assertIsInstance(ie2.name, str)
1328
1328
        self.assertEqual((b'tree\xce\xa9name', b'tree-root-id', b'tree-rev-id'),
1329
1329
                         inv._bytes_to_utf8name_key(bytes))
1330
1330