/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: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_xml.py
352
352
        self.assertEqual(props, new_rev.properties)
353
353
 
354
354
    def get_sample_inventory(self):
355
 
        inv = Inventory('tree-root-321', revision_id='rev_outer')
356
 
        inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
357
 
        inv.add(inventory.InventoryDirectory('dir-id', 'dir',
358
 
                                             'tree-root-321'))
359
 
        inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
360
 
        inv.get_entry('tree-root-321').revision = 'rev_outer'
361
 
        inv.get_entry('dir-id').revision = 'rev_outer'
362
 
        inv.get_entry('file-id').revision = 'rev_outer'
363
 
        inv.get_entry('file-id').text_sha1 = 'A'
364
 
        inv.get_entry('file-id').text_size = 1
365
 
        inv.get_entry('link-id').revision = 'rev_outer'
366
 
        inv.get_entry('link-id').symlink_target = 'a'
 
355
        inv = Inventory(b'tree-root-321', revision_id=b'rev_outer')
 
356
        inv.add(inventory.InventoryFile(b'file-id', 'file', b'tree-root-321'))
 
357
        inv.add(inventory.InventoryDirectory(b'dir-id', 'dir',
 
358
                                             b'tree-root-321'))
 
359
        inv.add(inventory.InventoryLink(b'link-id', 'link', b'tree-root-321'))
 
360
        inv.get_entry(b'tree-root-321').revision = b'rev_outer'
 
361
        inv.get_entry(b'dir-id').revision = b'rev_outer'
 
362
        inv.get_entry(b'file-id').revision = b'rev_outer'
 
363
        inv.get_entry(b'file-id').text_sha1 = 'A'
 
364
        inv.get_entry(b'file-id').text_size = 1
 
365
        inv.get_entry(b'link-id').revision = b'rev_outer'
 
366
        inv.get_entry(b'link-id').symlink_target = 'a'
367
367
        return inv
368
368
 
369
369
    def test_roundtrip_inventory_v7(self):
370
370
        inv = self.get_sample_inventory()
371
 
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
372
 
                                        'rev_outer', 'rev_inner'))
 
371
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
 
372
                                        b'rev_outer', b'rev_inner'))
373
373
        txt = xml7.serializer_v7.write_inventory_to_string(inv)
374
374
        lines = xml7.serializer_v7.write_inventory_to_lines(inv)
375
375
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
403
403
        s_v5 = breezy.bzr.xml5.serializer_v5
404
404
        s_v6 = breezy.bzr.xml6.serializer_v6
405
405
        s_v7 = xml7.serializer_v7
406
 
        inv = Inventory('tree-root-321', revision_id='rev-outer')
407
 
        inv.root.revision = 'root-rev'
408
 
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
409
 
                                        'rev-outer', 'rev-inner'))
 
406
        inv = Inventory(b'tree-root-321', revision_id=b'rev-outer')
 
407
        inv.root.revision = b'root-rev'
 
408
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
 
409
                                        b'rev-outer', b'rev-inner'))
410
410
        self.assertRaises(errors.UnsupportedInventoryKind,
411
411
                          s_v5.write_inventory_to_string, inv)
412
412
        self.assertRaises(errors.UnsupportedInventoryKind,
415
415
        lines = s_v7.write_inventory_to_lines(inv)
416
416
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
417
417
        inv2 = s_v7.read_inventory_from_string(txt)
418
 
        self.assertEqual('tree-root-321', inv2.get_entry('nested-id').parent_id)
419
 
        self.assertEqual('rev-outer', inv2.get_entry('nested-id').revision)
420
 
        self.assertEqual('rev-inner', inv2.get_entry('nested-id').reference_revision)
 
418
        self.assertEqual(b'tree-root-321', inv2.get_entry(b'nested-id').parent_id)
 
419
        self.assertEqual(b'rev-outer', inv2.get_entry(b'nested-id').revision)
 
420
        self.assertEqual(b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
421
421
 
422
422
    def test_roundtrip_inventory_v8(self):
423
423
        inv = self.get_sample_inventory()