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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_inventory_delta.py
19
19
See doc/developer/inventory.txt for more information.
20
20
"""
21
21
 
22
 
from cStringIO import StringIO
23
 
 
24
 
from breezy import (
 
22
from .. import (
25
23
    inventory,
26
24
    inventory_delta,
27
25
    )
28
 
from breezy.inventory_delta import InventoryDeltaError
29
 
from breezy.inventory import Inventory
30
 
from breezy.revision import NULL_REVISION
31
 
from breezy.tests import TestCase
 
26
from ..inventory_delta import InventoryDeltaError
 
27
from ..inventory import Inventory
 
28
from ..revision import NULL_REVISION
 
29
from ..sixish import (
 
30
    BytesIO,
 
31
    )
 
32
from . import TestCase
32
33
 
33
34
### DO NOT REFLOW THESE TEXTS. NEW LINES ARE SIGNIFICANT. ###
34
35
empty_lines = """format: bzr inventory delta v1 (bzr 1.14)
306
307
        delta = new_inv._make_delta(old_inv)
307
308
        serializer = inventory_delta.InventoryDeltaSerializer(
308
309
            versioned_root=True, tree_references=True)
309
 
        self.assertEqual(StringIO(empty_lines).readlines(),
 
310
        self.assertEqual(BytesIO(empty_lines).readlines(),
310
311
            serializer.delta_to_lines(NULL_REVISION, NULL_REVISION, delta))
311
312
 
312
313
    def test_root_only_to_lines(self):
318
319
        delta = new_inv._make_delta(old_inv)
319
320
        serializer = inventory_delta.InventoryDeltaSerializer(
320
321
            versioned_root=True, tree_references=True)
321
 
        self.assertEqual(StringIO(root_only_lines).readlines(),
 
322
        self.assertEqual(BytesIO(root_only_lines).readlines(),
322
323
            serializer.delta_to_lines(NULL_REVISION, 'entry-version', delta))
323
324
 
324
325
    def test_unversioned_root(self):
333
334
            versioned_root=False, tree_references=False)
334
335
        serialized_lines = serializer.delta_to_lines(
335
336
            NULL_REVISION, 'entry-version', delta)
336
 
        self.assertEqual(StringIO(root_only_unversioned).readlines(),
 
337
        self.assertEqual(BytesIO(root_only_unversioned).readlines(),
337
338
            serialized_lines)
338
339
        deserializer = inventory_delta.InventoryDeltaDeserializer()
339
340
        self.assertEqual(
434
435
        delta = new_inv._make_delta(old_inv)
435
436
        serializer = inventory_delta.InventoryDeltaSerializer(
436
437
            versioned_root=True, tree_references=True)
437
 
        self.assertEqual(StringIO(reference_lines).readlines(),
 
438
        self.assertEqual(BytesIO(reference_lines).readlines(),
438
439
            serializer.delta_to_lines(NULL_REVISION, 'entry-version', delta))
439
440
 
440
441
    def test_to_inventory_root_id_versioned_not_permitted(self):