~bzr-pqm/bzr/bzr.dev

4988.10.5 by John Arbash Meinel
Merge bzr.dev 5021 to resolve NEWS
1
# Copyright (C) 2006-2010 Canonical Ltd
1852.6.7 by Robert Collins
Fix up new tree_implementations __init__.py header.
2
#
1852.6.1 by Robert Collins
Start tree implementation tests.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1852.6.7 by Robert Collins
Fix up new tree_implementations __init__.py header.
7
#
1852.6.1 by Robert Collins
Start tree implementation tests.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1852.6.7 by Robert Collins
Fix up new tree_implementations __init__.py header.
12
#
1852.6.1 by Robert Collins
Start tree implementation tests.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1852.6.1 by Robert Collins
Start tree implementation tests.
16
17
18
"""Tree implementation tests for bzr.
19
20
These test the conformance of all the tree variations to the expected API.
21
Specific tests for individual variations are in other places such as:
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
22
 - tests/per_workingtree/*.py.
1852.6.1 by Robert Collins
Start tree implementation tests.
23
 - tests/test_tree.py
24
 - tests/test_revision.py
25
 - tests/test_workingtree.py
26
"""
27
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
28
from bzrlib import (
29
    errors,
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
30
    tests,
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
31
    transform,
32
    )
5363.2.18 by Jelmer Vernooij
Rename TestCaseWithBzrDir -> TestCaseWithControlDir.
33
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
4523.1.4 by Martin Pool
Rename remaining *_implementations tests
34
from bzrlib.tests.per_workingtree import (
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
35
    make_scenarios as wt_make_scenarios,
36
    make_scenario as wt_make_scenario,
2553.2.10 by Robert Collins
And overhaul WorkingTreeTestProviderAdapter too.
37
    )
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
38
from bzrlib.revisiontree import RevisionTree
3363.2.2 by Aaron Bentley
Add PreviewTree pre scenarios
39
from bzrlib.transform import TransformPreview
5967.12.1 by Martin Pool
Move all test features into bzrlib.tests.features
40
from bzrlib.tests import (
41
    features,
42
    )
2255.2.164 by Martin Pool
Change the default format for some tests from AB1 back to WorkingTreeFormat3
43
from bzrlib.workingtree import (
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
44
    format_registry,
2255.2.164 by Martin Pool
Change the default format for some tests from AB1 back to WorkingTreeFormat3
45
    )
2255.2.64 by John Arbash Meinel
Add the DirStateRevisionTree to the list of 'tree_implementations'
46
from bzrlib.workingtree_4 import (
47
    DirStateRevisionTree,
48
    WorkingTreeFormat4,
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
49
    WorkingTreeFormat5,
2255.2.64 by John Arbash Meinel
Add the DirStateRevisionTree to the list of 'tree_implementations'
50
    )
1852.6.1 by Robert Collins
Start tree implementation tests.
51
52
3363.1.2 by Aaron Bentley
Add TestCase as converter param
53
def return_parameter(testcase, something):
1852.6.1 by Robert Collins
Start tree implementation tests.
54
    """A trivial thunk to return its input."""
55
    return something
56
57
3363.1.2 by Aaron Bentley
Add TestCase as converter param
58
def revision_tree_from_workingtree(testcase, tree):
1852.6.1 by Robert Collins
Start tree implementation tests.
59
    """Create a revision tree from a working tree."""
2100.3.36 by Aaron Bentley
avoid subtree commit when converting a work tree into a revision tree
60
    revid = tree.commit('save tree', allow_pointless=True, recursive=None)
1852.6.1 by Robert Collins
Start tree implementation tests.
61
    return tree.branch.repository.revision_tree(revid)
62
63
3363.1.2 by Aaron Bentley
Add TestCase as converter param
64
def _dirstate_tree_from_workingtree(testcase, tree):
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
65
    revid = tree.commit('save tree', allow_pointless=True, recursive=None)
2255.2.64 by John Arbash Meinel
Add the DirStateRevisionTree to the list of 'tree_implementations'
66
    return tree.basis_tree()
67
68
3363.2.2 by Aaron Bentley
Add PreviewTree pre scenarios
69
def preview_tree_pre(testcase, tree):
70
    tt = TransformPreview(tree)
71
    testcase.addCleanup(tt.finalize)
3363.9.7 by Aaron Bentley
Fix up to use set_parent_ids
72
    preview_tree = tt.get_preview_tree()
73
    preview_tree.set_parent_ids(tree.get_parent_ids())
74
    return preview_tree
3363.2.2 by Aaron Bentley
Add PreviewTree pre scenarios
75
76
3363.10.2 by Aaron Bentley
Fake merge of removal of PreviewTreePost scenarios
77
def preview_tree_post(testcase, tree):
3363.10.13 by Aaron Bentley
Preserve past commits when converting to a PreviewTreePost
78
    basis = tree.basis_tree()
79
    tt = TransformPreview(basis)
3363.10.2 by Aaron Bentley
Fake merge of removal of PreviewTreePost scenarios
80
    testcase.addCleanup(tt.finalize)
3363.10.5 by Aaron Bentley
Fix locking issue
81
    tree.lock_read()
82
    testcase.addCleanup(tree.unlock)
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
83
    pp = None
84
    transform._prepare_revert_transform(basis, tree, tt, None, False, None,
3363.10.13 by Aaron Bentley
Preserve past commits when converting to a PreviewTreePost
85
                                        basis, {})
3363.10.22 by Aaron Bentley
Fix support for plan_file_merge in PreviewTreePost
86
    preview_tree = tt.get_preview_tree()
87
    preview_tree.set_parent_ids(tree.get_parent_ids())
88
    return preview_tree
3363.10.2 by Aaron Bentley
Fake merge of removal of PreviewTreePost scenarios
89
90
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
91
class TestTreeImplementationSupport(tests.TestCaseWithTransport):
1852.6.1 by Robert Collins
Start tree implementation tests.
92
93
    def test_revision_tree_from_workingtree(self):
94
        tree = self.make_branch_and_tree('.')
3363.1.3 by Aaron Bentley
Hide workingtree_to_test_tree behind a method, to get bound self
95
        tree = revision_tree_from_workingtree(self, tree)
1852.6.1 by Robert Collins
Start tree implementation tests.
96
        self.assertIsInstance(tree, RevisionTree)
97
98
5363.2.18 by Jelmer Vernooij
Rename TestCaseWithBzrDir -> TestCaseWithControlDir.
99
class TestCaseWithTree(TestCaseWithControlDir):
1852.6.1 by Robert Collins
Start tree implementation tests.
100
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
101
    def make_branch_and_tree(self, relpath):
102
        made_control = self.make_bzrdir(relpath, format=
103
            self.workingtree_format._matchingbzrdir)
1852.6.1 by Robert Collins
Start tree implementation tests.
104
        made_control.create_repository()
105
        made_control.create_branch()
106
        return self.workingtree_format.initialize(made_control)
107
3363.1.3 by Aaron Bentley
Hide workingtree_to_test_tree behind a method, to get bound self
108
    def workingtree_to_test_tree(self, tree):
109
        return self._workingtree_to_test_tree(self, tree)
110
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
111
    def _convert_tree(self, tree, converter=None):
112
        """helper to convert using the converter or a supplied one."""
113
        # convert that to the final shape
114
        if converter is None:
115
            converter = self.workingtree_to_test_tree
3363.1.3 by Aaron Bentley
Hide workingtree_to_test_tree behind a method, to get bound self
116
        return converter(tree)
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
117
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
118
    def get_tree_no_parents_no_content(self, empty_tree, converter=None):
119
        """Make a tree with no parents and no contents from empty_tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
120
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
121
        :param empty_tree: A working tree with no content and no parents to
122
            modify.
123
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
124
        empty_tree.set_root_id('empty-root-id')
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
125
        return self._convert_tree(empty_tree, converter)
1852.6.1 by Robert Collins
Start tree implementation tests.
126
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
127
    def _make_abc_tree(self, tree):
128
        """setup an abc content tree."""
129
        files = ['a', 'b/', 'b/c']
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
130
        self.build_tree(files, line_endings='binary',
1982.1.4 by Alexander Belchenko
tree_implementations tests: build_tree with binary (LF) line-endings
131
                        transport=tree.bzrdir.root_transport)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
132
        tree.set_root_id('root-id')
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
133
        tree.add(files, ['a-id', 'b-id', 'c-id'])
134
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
135
    def get_tree_no_parents_abc_content(self, tree, converter=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
136
        """return a test tree with a, b/, b/c contents."""
137
        self._make_abc_tree(tree)
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
138
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
139
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
140
    def get_tree_no_parents_abc_content_2(self, tree, converter=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
141
        """return a test tree with a, b/, b/c contents.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
142
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
143
        This variation changes the content of 'a' to foobar\n.
144
        """
145
        self._make_abc_tree(tree)
146
        f = open(tree.basedir + '/a', 'wb')
147
        try:
148
            f.write('foobar\n')
149
        finally:
150
            f.close()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
151
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
152
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
153
    def get_tree_no_parents_abc_content_3(self, tree, converter=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
154
        """return a test tree with a, b/, b/c contents.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
155
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
156
        This variation changes the executable flag of b/c to True.
157
        """
158
        self._make_abc_tree(tree)
159
        tt = transform.TreeTransform(tree)
160
        trans_id = tt.trans_id_tree_path('b/c')
161
        tt.set_executability(True, trans_id)
162
        tt.apply()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
163
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
164
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
165
    def get_tree_no_parents_abc_content_4(self, tree, converter=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
166
        """return a test tree with d, b/, b/c contents.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
167
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
168
        This variation renames a to d.
169
        """
170
        self._make_abc_tree(tree)
171
        tree.rename_one('a', 'd')
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
172
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
173
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
174
    def get_tree_no_parents_abc_content_5(self, tree, converter=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
175
        """return a test tree with d, b/, b/c contents.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
176
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
177
        This variation renames a to d and alters its content to 'bar\n'.
178
        """
179
        self._make_abc_tree(tree)
180
        tree.rename_one('a', 'd')
181
        f = open(tree.basedir + '/d', 'wb')
182
        try:
183
            f.write('bar\n')
184
        finally:
185
            f.close()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
186
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
187
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
188
    def get_tree_no_parents_abc_content_6(self, tree, converter=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
189
        """return a test tree with a, b/, e contents.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
190
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
191
        This variation renames b/c to e, and makes it executable.
192
        """
193
        self._make_abc_tree(tree)
194
        tt = transform.TreeTransform(tree)
195
        trans_id = tt.trans_id_tree_path('b/c')
196
        parent_trans_id = tt.trans_id_tree_path('')
197
        tt.adjust_path('e', parent_trans_id, trans_id)
198
        tt.set_executability(True, trans_id)
199
        tt.apply()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
200
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
201
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
202
    def get_tree_no_parents_abc_content_7(self, tree, converter=None):
203
        """return a test tree with a, b/, d/e contents.
204
205
        This variation adds a dir 'd' ('d-id'), renames b to d/e.
206
        """
207
        self._make_abc_tree(tree)
208
        self.build_tree(['d/'], transport=tree.bzrdir.root_transport)
209
        tree.add(['d'], ['d-id'])
210
        tt = transform.TreeTransform(tree)
211
        trans_id = tt.trans_id_tree_path('b')
212
        parent_trans_id = tt.trans_id_tree_path('d')
213
        tt.adjust_path('e', parent_trans_id, trans_id)
214
        tt.apply()
215
        return self._convert_tree(tree, converter)
216
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
217
    def get_tree_with_subdirs_and_all_content_types(self):
218
        """Return a test tree with subdirs and all content types.
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
219
        See get_tree_with_subdirs_and_all_supported_content_types for details.
220
        """
2408.1.8 by Alexander Belchenko
forget to return tree
221
        return self.get_tree_with_subdirs_and_all_supported_content_types(True)
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
222
223
    def get_tree_with_subdirs_and_all_supported_content_types(self, symlinks):
224
        """Return a test tree with subdirs and all supported content types.
225
        Some content types may not be created on some platforms
226
        (like symlinks on native win32)
227
228
        :param  symlinks:   control is symlink should be created in the tree.
229
                            Note: if you wish to automatically set this
230
                            parameters depending on underlying system,
231
                            please use value returned
232
                            by bzrlib.osutils.has_symlinks() function.
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
233
234
        The returned tree has the following inventory:
235
            [('', inventory.ROOT_ID),
236
             ('0file', '2file'),
237
             ('1top-dir', '1top-dir'),
238
             (u'2utf\u1234file', u'0utf\u1234file'),
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
239
             ('symlink', 'symlink'),            # only if symlinks arg is True
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
240
             ('1top-dir/0file-in-1topdir', '1file-in-1topdir'),
241
             ('1top-dir/1dir-in-1topdir', '0dir-in-1topdir')]
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
242
        where each component has the type of its name -
243
        i.e. '1file..' is afile.
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
244
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
245
        note that the order of the paths and fileids is deliberately
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
246
        mismatched to ensure that the result order is path based.
247
        """
5967.12.1 by Martin Pool
Move all test features into bzrlib.tests.features
248
        self.requireFeature(features.UnicodeFilenameFeature)
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
249
        tree = self.make_branch_and_tree('.')
250
        paths = ['0file',
251
            '1top-dir/',
252
            u'2utf\u1234file',
253
            '1top-dir/0file-in-1topdir',
254
            '1top-dir/1dir-in-1topdir/'
255
            ]
256
        ids = [
257
            '2file',
258
            '1top-dir',
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
259
            u'0utf\u1234file'.encode('utf8'),
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
260
            '1file-in-1topdir',
261
            '0dir-in-1topdir'
262
            ]
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
263
        self.build_tree(paths)
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
264
        tree.add(paths, ids)
265
        tt = transform.TreeTransform(tree)
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
266
        if symlinks:
267
            root_transaction_id = tt.trans_id_tree_path('')
268
            tt.new_symlink('symlink',
269
                root_transaction_id, 'link-target', 'symlink')
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
270
        tt.apply()
271
        return self.workingtree_to_test_tree(tree)
272
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
273
    def get_tree_with_utf8(self, tree):
274
        """Generate a tree with a utf8 revision and unicode paths."""
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
275
        self._create_tree_with_utf8(tree)
276
        return self.workingtree_to_test_tree(tree)
277
278
    def _create_tree_with_utf8(self, tree):
279
        """Generate a tree with a utf8 revision and unicode paths."""
5967.12.1 by Martin Pool
Move all test features into bzrlib.tests.features
280
        self.requireFeature(features.UnicodeFilenameFeature)
3638.3.11 by Vincent Ladeuil
Fix failing tests by avoiding unicode combinig encodings (we test
281
        # We avoid combining characters in file names here, normalization
282
        # checks (as performed by some file systems (OSX) are outside the scope
283
        # of these tests).  We use the euro sign \N{Euro Sign} or \u20ac in
284
        # unicode strings or '\xe2\x82\ac' (its utf-8 encoding) in raw strings.
2294.1.3 by John Arbash Meinel
Make sure the inventory enrtries returned are properly formed.
285
        paths = [u'',
3638.3.11 by Vincent Ladeuil
Fix failing tests by avoiding unicode combinig encodings (we test
286
                 u'fo\N{Euro Sign}o',
287
                 u'ba\N{Euro Sign}r/',
288
                 u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
289
                ]
290
        # bzr itself does not create unicode file ids, but we want them for
291
        # testing.
2309.4.10 by John Arbash Meinel
(fixed) Fix the last few tests that were explicitly passing around unicode ids
292
        file_ids = ['TREE_ROOT',
3638.3.11 by Vincent Ladeuil
Fix failing tests by avoiding unicode combinig encodings (we test
293
                    'fo\xe2\x82\xaco-id',
294
                    'ba\xe2\x82\xacr-id',
295
                    'ba\xe2\x82\xacz-id',
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
296
                   ]
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
297
        self.build_tree(paths[1:])
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
298
        if tree.get_root_id() is None:
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
299
            # Some trees do not have a root yet.
300
            tree.add(paths, file_ids)
301
        else:
302
            # Some trees will already have a root
303
            tree.set_root_id(file_ids[0])
304
            tree.add(paths[1:], file_ids[1:])
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
305
        try:
306
            tree.commit(u'in\xedtial', rev_id=u'r\xe9v-1'.encode('utf8'))
307
        except errors.NonAsciiRevisionId:
308
            raise tests.TestSkipped('non-ascii revision ids not supported')
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
309
310
    def get_tree_with_merged_utf8(self, tree):
311
        """Generate a tree with utf8 ancestors."""
312
        self._create_tree_with_utf8(tree)
313
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
3638.3.11 by Vincent Ladeuil
Fix failing tests by avoiding unicode combinig encodings (we test
314
        self.build_tree([u'tree2/ba\N{Euro Sign}r/qu\N{Euro Sign}x'])
315
        tree2.add([u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'],
316
                  [u'qu\N{Euro Sign}x-id'.encode('utf-8')])
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
317
        tree2.commit(u'to m\xe9rge', rev_id=u'r\xe9v-2'.encode('utf8'))
318
319
        tree.merge_from_branch(tree2.branch)
320
        tree.commit(u'm\xe9rge', rev_id=u'r\xe9v-3'.encode('utf8'))
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
321
        return self.workingtree_to_test_tree(tree)
322
1852.6.1 by Robert Collins
Start tree implementation tests.
323
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
324
def make_scenarios(transport_server, transport_readonly_server, formats):
1852.6.1 by Robert Collins
Start tree implementation tests.
325
    """Generate test suites for each Tree implementation in bzrlib.
326
2553.2.10 by Robert Collins
And overhaul WorkingTreeTestProviderAdapter too.
327
    Currently this covers all working tree formats, and RevisionTree and
328
    DirStateRevisionTree by committing a working tree to create the revision
329
    tree.
1852.6.1 by Robert Collins
Start tree implementation tests.
330
    """
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
331
    scenarios = wt_make_scenarios(transport_server, transport_readonly_server,
332
        formats)
333
    # now adjust the scenarios and add the non-working-tree tree scenarios.
334
    for scenario in scenarios:
335
        # for working tree format tests, preserve the tree
336
        scenario[1]["_workingtree_to_test_tree"] = return_parameter
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
337
    # add RevisionTree scenario
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
338
    workingtree_format = format_registry.get_default()
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
339
    scenarios.append((RevisionTree.__name__,
340
        create_tree_scenario(transport_server, transport_readonly_server,
341
        workingtree_format, revision_tree_from_workingtree,)))
342
343
    # also test WorkingTree4/5's RevisionTree implementation which is
344
    # specialised.
345
    # XXX: Ask igc if WT5 revision tree actually is different.
346
    scenarios.append((DirStateRevisionTree.__name__ + ",WT4",
347
        create_tree_scenario(transport_server, transport_readonly_server,
348
        WorkingTreeFormat4(), _dirstate_tree_from_workingtree)))
349
    scenarios.append((DirStateRevisionTree.__name__ + ",WT5",
350
        create_tree_scenario(transport_server, transport_readonly_server,
351
        WorkingTreeFormat5(), _dirstate_tree_from_workingtree)))
352
    scenarios.append(("PreviewTree", create_tree_scenario(transport_server,
353
        transport_readonly_server, workingtree_format, preview_tree_pre)))
354
    scenarios.append(("PreviewTreePost", create_tree_scenario(transport_server,
355
        transport_readonly_server, workingtree_format, preview_tree_post)))
356
    return scenarios
357
358
359
def create_tree_scenario(transport_server, transport_readonly_server,
360
    workingtree_format, converter):
361
    """Create a scenario for the specified converter
362
363
    :param converter: A function that converts a workingtree into the
364
        desired format.
365
    :param workingtree_format: The particular workingtree format to
366
        convert from.
367
    :return: a (name, options) tuple, where options is a dict of values
368
        to be used as members of the TestCase.
369
    """
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
370
    scenario_options = wt_make_scenario(transport_server,
371
                                        transport_readonly_server,
372
                                        workingtree_format)
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
373
    scenario_options["_workingtree_to_test_tree"] = converter
374
    return scenario_options
375
376
377
def load_tests(standard_tests, module, loader):
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
378
    per_tree_mod_names = [
379
        'annotate_iter',
5809.3.1 by Aaron Bentley
Switch to iter_entries_by_dir.
380
        'export',
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
381
        'get_file_mtime',
382
        'get_file_with_stat',
383
        'get_root_id',
384
        'get_symlink_target',
6478.2.1 by Jelmer Vernooij
Accept path element list as argument to Tree.path2id.
385
        'ids',
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
386
        'inv',
387
        'iter_search_rules',
5050.57.1 by Aaron Bentley
Make is_executable treat symlinks and directories the same across tree types.
388
        'is_executable',
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
389
        'list_files',
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
390
        'locking',
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
391
        'path_content_summary',
392
        'revision_tree',
393
        'test_trees',
394
        'tree',
395
        'walkdirs',
396
        ]
397
    submod_tests = loader.loadTestsFromModuleNames(
398
        ['bzrlib.tests.per_tree.test_' + name
399
         for name in per_tree_mod_names])
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
400
    scenarios = make_scenarios(
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
401
        tests.default_transport,
1852.6.1 by Robert Collins
Start tree implementation tests.
402
        # None here will cause a readonly decorator to be created
403
        # by the TestCaseWithTransport.get_readonly_transport method.
404
        None,
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
405
        format_registry._get_all())
3302.9.27 by Vincent Ladeuil
Fixed as per Ian's review.
406
    # add the tests for the sub modules
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
407
    return tests.multiply_tests(submod_tests, scenarios, standard_tests)