/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_tree/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-15 22:46:49 UTC
  • mto: (7490.40.103 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200815224649-5xdaij8k1ojygidh
Some fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_transform.py
30
30
    )
31
31
from ...tree import (
32
32
    find_previous_path,
 
33
    TreeChange,
33
34
    )
34
35
 
35
36
from breezy.bzr.inventorytree import InventoryTreeChange
155
156
        if tree.supports_setting_file_ids():
156
157
            self.assertEqual(expected, actual)
157
158
        else:
158
 
            for c in expected + actual:
159
 
                c.file_id = None
 
159
            expected = [
 
160
                TreeChange(path=c.path, changed_content=c.changed_content,
 
161
                           versioned=c.versioned, name=c.name,
 
162
                           kind=c.kind, executable=c.executable,
 
163
                           copied=c.copied) for c in expected]
 
164
            actual = [
 
165
                TreeChange(path=c.path, changed_content=c.changed_content,
 
166
                           versioned=c.versioned, name=c.name,
 
167
                           kind=c.kind, executable=c.executable,
 
168
                           copied=c.copied) for c in actual]
160
169
            self.assertEqual(expected, actual)
161
170
 
162
171
    def test_include_unchanged_succeeds(self):