/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: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
861
861
        inv.root.revision = b"rootrev"
862
862
        chk_bytes = self.get_chk_bytes()
863
863
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
864
 
        lines = chk_inv.to_lines()
865
 
        new_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
864
        bytes = b''.join(chk_inv.to_lines())
 
865
        new_inv = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
866
866
        self.assertEqual(b"revid", new_inv.revision_id)
867
867
        self.assertEqual("directory", new_inv.root.kind)
868
868
        self.assertEqual(inv.root.file_id, new_inv.root.file_id)
877
877
        inv.root.revision = b"rootrev"
878
878
        chk_bytes = self.get_chk_bytes()
879
879
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
880
 
        lines = chk_inv.to_lines()
 
880
        bytes = b''.join(chk_inv.to_lines())
881
881
        self.assertRaises(ValueError, CHKInventory.deserialise, chk_bytes,
882
 
                          lines, (b"revid2",))
 
882
                          bytes, (b"revid2",))
883
883
 
884
884
    def test_captures_rev_root_byid(self):
885
885
        inv = Inventory()
896
896
            b'id_to_entry: sha1:debfe920f1f10e7929260f0534ac9a24d7aabbb4\n',
897
897
            ], lines)
898
898
        chk_inv = CHKInventory.deserialise(
899
 
            chk_bytes, lines, (b'foo',))
 
899
            chk_bytes, b''.join(lines), (b'foo',))
900
900
        self.assertEqual(b'plain', chk_inv._search_key_name)
901
901
 
902
902
    def test_captures_parent_id_basename_index(self):
914
914
            b'id_to_entry: sha1:debfe920f1f10e7929260f0534ac9a24d7aabbb4\n',
915
915
            ], lines)
916
916
        chk_inv = CHKInventory.deserialise(
917
 
            chk_bytes, lines, (b'foo',))
 
917
            chk_bytes, b''.join(lines), (b'foo',))
918
918
        self.assertEqual(b'plain', chk_inv._search_key_name)
919
919
 
920
920
    def test_captures_search_key_name(self):
934
934
            b'id_to_entry: sha1:debfe920f1f10e7929260f0534ac9a24d7aabbb4\n',
935
935
            ], lines)
936
936
        chk_inv = CHKInventory.deserialise(
937
 
            chk_bytes, lines, (b'foo',))
 
937
            chk_bytes, b''.join(lines), (b'foo',))
938
938
        self.assertEqual(b'hash-16-way', chk_inv._search_key_name)
939
939
 
940
940
    def test_directory_children_on_demand(self):
948
948
        inv.get_entry(b"fileid").text_size = 1
949
949
        chk_bytes = self.get_chk_bytes()
950
950
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
951
 
        lines = chk_inv.to_lines()
952
 
        new_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
951
        bytes = b''.join(chk_inv.to_lines())
 
952
        new_inv = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
953
953
        root_entry = new_inv.get_entry(inv.root.file_id)
954
954
        self.assertEqual(None, root_entry._children)
955
955
        self.assertEqual({'file'}, set(root_entry.children))
990
990
        inv.get_entry(b"fileid").text_size = 1
991
991
        chk_bytes = self.get_chk_bytes()
992
992
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
993
 
        lines = chk_inv.to_lines()
994
 
        new_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
993
        bytes = b''.join(chk_inv.to_lines())
 
994
        new_inv = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
995
995
        fileids = sorted(new_inv.iter_all_ids())
996
996
        self.assertEqual([inv.root.file_id, b"fileid"], fileids)
997
997
 
1019
1019
        inv.get_entry(b"fileid").text_size = 1
1020
1020
        chk_bytes = self.get_chk_bytes()
1021
1021
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
1022
 
        lines = chk_inv.to_lines()
1023
 
        new_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1022
        data = b''.join(chk_inv.to_lines())
 
1023
        new_inv = CHKInventory.deserialise(chk_bytes, data, (b"revid",))
1024
1024
        root_entry = new_inv.get_entry(inv.root.file_id)
1025
1025
        file_entry = new_inv.get_entry(b"fileid")
1026
1026
        self.assertEqual("directory", root_entry.kind)
1075
1075
        inv.get_entry(b"dirid").revision = b"filerev"
1076
1076
        chk_bytes = self.get_chk_bytes()
1077
1077
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
1078
 
        lines = chk_inv.to_lines()
1079
 
        new_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1078
        bytes = b''.join(chk_inv.to_lines())
 
1079
        new_inv = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
1080
1080
        self.assertEqual('', new_inv.id2path(inv.root.file_id))
1081
1081
        self.assertEqual('dir', new_inv.id2path(b'dirid'))
1082
1082
        self.assertEqual('dir/file', new_inv.id2path(b'fileid'))
1096
1096
        inv.get_entry(b"dirid").revision = b"filerev"
1097
1097
        chk_bytes = self.get_chk_bytes()
1098
1098
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
1099
 
        lines = chk_inv.to_lines()
1100
 
        new_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1099
        bytes = b''.join(chk_inv.to_lines())
 
1100
        new_inv = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
1101
1101
        self.assertEqual(inv.root.file_id, new_inv.path2id(''))
1102
1102
        self.assertEqual(b'dirid', new_inv.path2id('dir'))
1103
1103
        self.assertEqual(b'fileid', new_inv.path2id('dir/file'))
1191
1191
        # get fresh objects.
1192
1192
        chk_bytes = self.get_chk_bytes()
1193
1193
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
1194
 
        lines = chk_inv.to_lines()
1195
 
        inv_1 = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1194
        bytes = b''.join(chk_inv.to_lines())
 
1195
        inv_1 = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
1196
1196
        chk_inv2 = CHKInventory.from_inventory(chk_bytes, inv2)
1197
 
        lines = chk_inv2.to_lines()
1198
 
        inv_2 = CHKInventory.deserialise(chk_bytes, lines, (b"revid2",))
 
1197
        bytes = b''.join(chk_inv2.to_lines())
 
1198
        inv_2 = CHKInventory.deserialise(chk_bytes, bytes, (b"revid2",))
1199
1199
        self.assertEqual([(b'fileid', (u'file', u'file'), True, (True, True),
1200
1200
                           (b'TREE_ROOT', b'TREE_ROOT'), (u'file',
1201
1201
                                                          u'file'), ('file', 'file'),
1214
1214
        # get fresh objects.
1215
1215
        chk_bytes = self.get_chk_bytes()
1216
1216
        tmp_inv = CHKInventory.from_inventory(chk_bytes, inv)
1217
 
        lines = tmp_inv.to_lines()
1218
 
        chk_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1217
        bytes = b''.join(tmp_inv.to_lines())
 
1218
        chk_inv = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
1219
1219
        self.assertIsInstance(
1220
1220
            chk_inv.parent_id_basename_to_file_id, chk_map.CHKMap)
1221
1221
        self.assertEqual(
1345
1345
        inv.get_entry(b"childid").text_size = 0
1346
1346
        chk_bytes = self.get_chk_bytes()
1347
1347
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
1348
 
        lines = chk_inv.to_lines()
1349
 
        return CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1348
        bytes = b''.join(chk_inv.to_lines())
 
1349
        return CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
1350
1350
 
1351
1351
    def test__preload_handles_utf8(self):
1352
1352
        new_inv = self.make_basic_utf8_inventory()
1381
1381
        inv.get_entry(b"childid").text_size = 1
1382
1382
        chk_bytes = self.get_chk_bytes()
1383
1383
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv)
1384
 
        lines = chk_inv.to_lines()
1385
 
        new_inv = CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1384
        bytes = b''.join(chk_inv.to_lines())
 
1385
        new_inv = CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
1386
1386
        self.assertEqual({}, new_inv._fileid_to_entry_cache)
1387
1387
        self.assertFalse(new_inv._fully_cached)
1388
1388
        new_inv._preload_cache()
1485
1485
        chk_inv = CHKInventory.from_inventory(chk_bytes, inv,
1486
1486
                                              maximum_size=100,
1487
1487
                                              search_key_name=b'hash-255-way')
1488
 
        lines = chk_inv.to_lines()
1489
 
        return CHKInventory.deserialise(chk_bytes, lines, (b"revid",))
 
1488
        bytes = b''.join(chk_inv.to_lines())
 
1489
        return CHKInventory.deserialise(chk_bytes, bytes, (b"revid",))
1490
1490
 
1491
1491
    def assert_Getitems(self, expected_fileids, inv, file_ids):
1492
1492
        self.assertEqual(sorted(expected_fileids),