72
73
mutable_trees_to_test_trees)
76
for (label, intertree_class,
76
77
workingtree_format,
77
78
workingtree_format_to,
78
79
mutable_trees_to_test_trees) in formats:
79
scenario = (intertree_class.__name__, {
80
81
"transport_server":self._transport_server,
81
82
"transport_readonly_server":self._transport_readonly_server,
82
83
"bzrdir_format":workingtree_format._matchingbzrdir,
110
111
test_intertree_permutations = [
111
112
# test InterTree with two default-format working trees.
112
(InterTree, default_tree_format, default_tree_format,
113
(InterTree.__name__, InterTree, default_tree_format, default_tree_format,
113
114
return_provided_trees)]
114
115
for optimiser in InterTree._optimisers:
115
test_intertree_permutations.append(
117
optimiser._matching_from_tree_format,
118
optimiser._matching_to_tree_format,
119
optimiser._test_mutable_trees_to_test_trees))
116
if optimiser is bzrlib.workingtree_4.InterDirStateTree:
117
# Its a little ugly to be conditional here, but less so than having
118
# the optimiser listed twice.
119
# Add once, compiled version
120
test_intertree_permutations.append(
121
(optimiser.__name__ + "(C)",
123
optimiser._matching_from_tree_format,
124
optimiser._matching_to_tree_format,
125
optimiser.make_source_parent_tree_compiled_dirstate))
127
test_intertree_permutations.append(
128
(optimiser.__name__ + "(PY)",
130
optimiser._matching_from_tree_format,
131
optimiser._matching_to_tree_format,
132
optimiser.make_source_parent_tree_python_dirstate))
134
test_intertree_permutations.append(
137
optimiser._matching_from_tree_format,
138
optimiser._matching_to_tree_format,
139
optimiser._test_mutable_trees_to_test_trees))
140
# PreviewTree does not have an InterTree optimiser class.
122
141
test_intertree_permutations.append(
142
(InterTree.__name__ + "(PreviewTree)",
124
144
default_tree_format,
125
145
default_tree_format,
126
146
mutable_trees_to_preview_trees))
added
removed
bzrlib/tests/intertree_implementations/__init__.py
