/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/per_repository/test_commit_builder.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_repository/test_commit_builder.py
26
26
    revision as _mod_revision,
27
27
    tests,
28
28
    )
29
 
from breezy.tree import TreeChange
30
29
from breezy.bzr import (
31
30
    inventorytree,
32
31
    )
 
32
from breezy.bzr.inventorytree import InventoryTreeChange
33
33
from breezy.tests import per_repository
34
34
from breezy.tests import (
35
35
    features,
196
196
        with tree.lock_write():
197
197
            builder = tree.branch.get_commit_builder([rev_id])
198
198
            try:
199
 
                delete_change = TreeChange(
 
199
                delete_change = InventoryTreeChange(
200
200
                    foo_id, ('foo', None), True, (True, False),
201
201
                    (tree.path2id(''), None),
202
202
                    ('foo', None), ('file', None),
527
527
                self.assertEqual(delta_entry.name, new_entry.name)
528
528
                self.assertEqual(delta_entry.parent_id, new_entry.parent_id)
529
529
                if delta_entry.kind == 'file':
530
 
                    self.assertEqual(delta_entry.text_size, new_entry.text_size)
531
 
                    self.assertEqual(delta_entry.text_sha1, new_entry.text_sha1)
 
530
                    self.assertEqual(delta_entry.text_size, revtree.get_file_size(new_name))
 
531
                    if getattr(delta_entry, 'text_sha1', None):
 
532
                        self.assertEqual(delta_entry.text_sha1, revtree.get_file_sha1(new_name))
532
533
                elif delta_entry.kind == 'symlink':
533
534
                    self.assertEqual(delta_entry.symlink_target, new_entry.symlink_target)
534
535
            else: