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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-01 21:57:00 UTC
  • mfrom: (7490.39.3 move-launchpad)
  • Revision ID: breezy.the.bot@gmail.com-20200601215700-joxuzo6w172gq74v
Move launchpad hoster support to the launchpad plugin.

Merged from https://code.launchpad.net/~jelmer/brz/move-launchpad/+merge/384931

Show diffs side-by-side

added added

removed removed

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