/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_intertree/__init__.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/__init__.py
30
30
from breezy.bzr import (
31
31
    inventorytree,
32
32
    )
33
 
from breezy.transform import TransformPreview
34
33
from breezy.tests import (
35
34
    default_transport,
36
35
    multiply_tests,
111
110
 
112
111
 
113
112
def mutable_trees_to_preview_trees(test_case, source, target):
114
 
    preview = TransformPreview(target)
 
113
    preview = target.preview_transform()
115
114
    test_case.addCleanup(preview.finalize)
116
115
    return source, preview.get_preview_tree()
117
116
 
131
130
        ])
132
131
    test_intertree_permutations = [
133
132
        # test InterTree with two default-format working trees.
134
 
        (InterTree.__name__, InterTree,
 
133
        (inventorytree.InterInventoryTree.__name__,
 
134
         inventorytree.InterInventoryTree,
135
135
         default_tree_format, default_tree_format,
136
136
         return_provided_trees)]
137
137
    for optimiser in InterTree.iter_optimisers():
142
142
            chk_tree_format._get_matchingcontroldir = \
143
143
                lambda: breezy.controldir.format_registry.make_controldir('2a')
144
144
            test_intertree_permutations.append(
145
 
                (InterTree.__name__ + "(CHKInventory)",
146
 
                 InterTree,
 
145
                (inventorytree.InterInventoryTree.__name__ + "(CHKInventory)",
 
146
                 inventorytree.InterInventoryTree,
147
147
                 chk_tree_format,
148
148
                 chk_tree_format,
149
149
                 mutable_trees_to_revision_trees))
174
174
                 optimiser._test_mutable_trees_to_test_trees))
175
175
    # PreviewTree does not have an InterTree optimiser class.
176
176
    test_intertree_permutations.append(
177
 
        (InterTree.__name__ + "(PreviewTree)",
178
 
         InterTree,
 
177
        (inventorytree.InterInventoryTree.__name__ + "(PreviewTree)",
 
178
         inventorytree.InterInventoryTree,
179
179
         default_tree_format,
180
180
         default_tree_format,
181
181
         mutable_trees_to_preview_trees))