/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/bzr/tests/test_xml.py

  • Committer: Gustav Hartvigsson
  • Date: 2021-01-11 20:19:38 UTC
  • mfrom: (7526.3.2 work)
  • Revision ID: gustav.hartvigsson@gmail.com-20210111201938-omr9wjz3qdgyxe8k
Merged lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/tests/test_xml.py
16
16
 
17
17
from io import BytesIO
18
18
 
19
 
from .. import (
 
19
from ... import (
20
20
    errors,
21
21
    fifo_cache,
22
22
    )
23
 
from ..bzr import (
 
23
from .. import (
24
24
    inventory,
 
25
    serializer,
25
26
    xml6,
26
27
    xml7,
27
28
    xml8,
28
29
    )
29
 
from ..bzr.inventory import Inventory
 
30
from ..inventory import Inventory
30
31
from . import TestCase
31
32
import breezy.bzr.xml5
32
33
 
406
407
        """Can't accidentally open a file with wrong serializer"""
407
408
        s_v6 = breezy.bzr.xml6.serializer_v6
408
409
        s_v7 = xml7.serializer_v7
409
 
        self.assertRaises(errors.UnexpectedInventoryFormat,
 
410
        self.assertRaises(serializer.UnexpectedInventoryFormat,
410
411
                          s_v7.read_inventory_from_lines,
411
412
                          breezy.osutils.split_lines(_expected_inv_v5))
412
 
        self.assertRaises(errors.UnexpectedInventoryFormat,
 
413
        self.assertRaises(serializer.UnexpectedInventoryFormat,
413
414
                          s_v6.read_inventory_from_lines,
414
415
                          breezy.osutils.split_lines(_expected_inv_v7))
415
416
 
421
422
        inv.root.revision = b'root-rev'
422
423
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
423
424
                                        b'rev-outer', b'rev-inner'))
424
 
        self.assertRaises(errors.UnsupportedInventoryKind,
 
425
        self.assertRaises(serializer.UnsupportedInventoryKind,
425
426
                          s_v5.write_inventory_to_lines, inv)
426
 
        self.assertRaises(errors.UnsupportedInventoryKind,
 
427
        self.assertRaises(serializer.UnsupportedInventoryKind,
427
428
                          s_v6.write_inventory_to_lines, inv)
428
429
        lines = s_v7.write_inventory_to_chunks(inv)
429
430
        inv2 = s_v7.read_inventory_from_lines(lines)
525
526
    def test_serialization_error(self):
526
527
        s_v5 = breezy.bzr.xml5.serializer_v5
527
528
        e = self.assertRaises(
528
 
            errors.UnexpectedInventoryFormat,
 
529
            serializer.UnexpectedInventoryFormat,
529
530
            s_v5.read_inventory_from_lines, [b"<Notquitexml"])
530
531
        self.assertEqual(str(e), "unclosed token: line 1, column 0")
531
532