/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
1
# Copyright (C) 2006, 2007 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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:
22
 - tests/test_tree.py
23
 - tests/test_revision.py
24
 - tests/test_workingtree.py
25
 - tests/workingtree_implementations/*.py.
26
"""
27
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
28
from bzrlib import (
29
    errors,
2309.4.10 by John Arbash Meinel
(fixed) Fix the last few tests that were explicitly passing around unicode ids
30
    osutils,
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
31
    tests,
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
32
    transform,
33
    )
1852.6.1 by Robert Collins
Start tree implementation tests.
34
from bzrlib.transport import get_transport
35
from bzrlib.tests import (
36
                          adapt_modules,
37
                          default_transport,
38
                          TestCaseWithTransport,
39
                          TestLoader,
2321.1.2 by Robert Collins
Skip new tests that depend on unicode file paths.
40
                          TestSkipped,
1852.6.1 by Robert Collins
Start tree implementation tests.
41
                          TestSuite,
42
                          )
43
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
44
from bzrlib.revisiontree import RevisionTree
2255.2.164 by Martin Pool
Change the default format for some tests from AB1 back to WorkingTreeFormat3
45
from bzrlib.workingtree import (
46
    WorkingTreeFormat,
47
    WorkingTreeFormat3,
48
    WorkingTreeTestProviderAdapter,
49
    _legacy_formats,
50
    )
2255.2.64 by John Arbash Meinel
Add the DirStateRevisionTree to the list of 'tree_implementations'
51
from bzrlib.workingtree_4 import (
52
    DirStateRevisionTree,
53
    WorkingTreeFormat4,
54
    )
1852.6.1 by Robert Collins
Start tree implementation tests.
55
56
57
def return_parameter(something):
58
    """A trivial thunk to return its input."""
59
    return something
60
61
62
def revision_tree_from_workingtree(tree):
63
    """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
64
    revid = tree.commit('save tree', allow_pointless=True, recursive=None)
1852.6.1 by Robert Collins
Start tree implementation tests.
65
    return tree.branch.repository.revision_tree(revid)
66
67
2255.2.64 by John Arbash Meinel
Add the DirStateRevisionTree to the list of 'tree_implementations'
68
def _dirstate_tree_from_workingtree(tree):
69
    revid = tree.commit('save tree', allow_pointless=True)
70
    return tree.basis_tree()
71
72
1852.6.1 by Robert Collins
Start tree implementation tests.
73
class TestTreeImplementationSupport(TestCaseWithTransport):
74
75
    def test_revision_tree_from_workingtree(self):
76
        tree = self.make_branch_and_tree('.')
77
        tree = revision_tree_from_workingtree(tree)
78
        self.assertIsInstance(tree, RevisionTree)
79
80
81
class TestCaseWithTree(TestCaseWithBzrDir):
82
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
83
    def make_branch_and_tree(self, relpath):
84
        made_control = self.make_bzrdir(relpath, format=
85
            self.workingtree_format._matchingbzrdir)
1852.6.1 by Robert Collins
Start tree implementation tests.
86
        made_control.create_repository()
87
        made_control.create_branch()
88
        return self.workingtree_format.initialize(made_control)
89
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
90
    def _convert_tree(self, tree, converter=None):
91
        """helper to convert using the converter or a supplied one."""
92
        # convert that to the final shape
93
        if converter is None:
94
            converter = self.workingtree_to_test_tree
95
        return converter(tree)
96
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
97
    def get_tree_no_parents_no_content(self, empty_tree, converter=None):
98
        """Make a tree with no parents and no contents from empty_tree.
99
        
100
        :param empty_tree: A working tree with no content and no parents to
101
            modify.
102
        """
1731.1.33 by Aaron Bentley
Revert no-special-root changes
103
        empty_tree.set_root_id('empty-root-id')
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
104
        return self._convert_tree(empty_tree, converter)
1852.6.1 by Robert Collins
Start tree implementation tests.
105
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
106
    def _make_abc_tree(self, tree):
107
        """setup an abc content tree."""
108
        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.
109
        self.build_tree(files, line_endings='binary',
1982.1.4 by Alexander Belchenko
tree_implementations tests: build_tree with binary (LF) line-endings
110
                        transport=tree.bzrdir.root_transport)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
111
        tree.set_root_id('root-id')
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
112
        tree.add(files, ['a-id', 'b-id', 'c-id'])
113
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
114
    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.
115
        """return a test tree with a, b/, b/c contents."""
116
        self._make_abc_tree(tree)
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
117
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
118
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
119
    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.
120
        """return a test tree with a, b/, b/c contents.
121
        
122
        This variation changes the content of 'a' to foobar\n.
123
        """
124
        self._make_abc_tree(tree)
125
        f = open(tree.basedir + '/a', 'wb')
126
        try:
127
            f.write('foobar\n')
128
        finally:
129
            f.close()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
130
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
131
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
132
    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.
133
        """return a test tree with a, b/, b/c contents.
134
        
135
        This variation changes the executable flag of b/c to True.
136
        """
137
        self._make_abc_tree(tree)
138
        tt = transform.TreeTransform(tree)
139
        trans_id = tt.trans_id_tree_path('b/c')
140
        tt.set_executability(True, trans_id)
141
        tt.apply()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
142
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
143
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
144
    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.
145
        """return a test tree with d, b/, b/c contents.
146
        
147
        This variation renames a to d.
148
        """
149
        self._make_abc_tree(tree)
150
        tree.rename_one('a', 'd')
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_5(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 d, b/, b/c contents.
155
        
156
        This variation renames a to d and alters its content to 'bar\n'.
157
        """
158
        self._make_abc_tree(tree)
159
        tree.rename_one('a', 'd')
160
        f = open(tree.basedir + '/d', 'wb')
161
        try:
162
            f.write('bar\n')
163
        finally:
164
            f.close()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
165
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
166
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
167
    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.
168
        """return a test tree with a, b/, e contents.
169
        
170
        This variation renames b/c to e, and makes it executable.
171
        """
172
        self._make_abc_tree(tree)
173
        tt = transform.TreeTransform(tree)
174
        trans_id = tt.trans_id_tree_path('b/c')
175
        parent_trans_id = tt.trans_id_tree_path('')
176
        tt.adjust_path('e', parent_trans_id, trans_id)
177
        tt.set_executability(True, trans_id)
178
        tt.apply()
1852.8.7 by Robert Collins
Update tree_implementation test tree factories to be intertree ready.
179
        return self._convert_tree(tree, converter)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
180
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
181
    def get_tree_with_subdirs_and_all_content_types(self):
182
        """Return a test tree with subdirs and all content types.
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
183
        See get_tree_with_subdirs_and_all_supported_content_types for details.
184
        """
2408.1.8 by Alexander Belchenko
forget to return tree
185
        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
186
187
    def get_tree_with_subdirs_and_all_supported_content_types(self, symlinks):
188
        """Return a test tree with subdirs and all supported content types.
189
        Some content types may not be created on some platforms
190
        (like symlinks on native win32)
191
192
        :param  symlinks:   control is symlink should be created in the tree.
193
                            Note: if you wish to automatically set this
194
                            parameters depending on underlying system,
195
                            please use value returned
196
                            by bzrlib.osutils.has_symlinks() function.
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
197
198
        The returned tree has the following inventory:
199
            [('', inventory.ROOT_ID),
200
             ('0file', '2file'),
201
             ('1top-dir', '1top-dir'),
202
             (u'2utf\u1234file', u'0utf\u1234file'),
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
203
             ('symlink', 'symlink'),            # only if symlinks arg is True
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
204
             ('1top-dir/0file-in-1topdir', '1file-in-1topdir'),
205
             ('1top-dir/1dir-in-1topdir', '0dir-in-1topdir')]
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
206
        where each component has the type of its name -
207
        i.e. '1file..' is afile.
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
208
209
        note that the order of the paths and fileids is deliberately 
210
        mismatched to ensure that the result order is path based.
211
        """
212
        tree = self.make_branch_and_tree('.')
213
        paths = ['0file',
214
            '1top-dir/',
215
            u'2utf\u1234file',
216
            '1top-dir/0file-in-1topdir',
217
            '1top-dir/1dir-in-1topdir/'
218
            ]
219
        ids = [
220
            '2file',
221
            '1top-dir',
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
222
            u'0utf\u1234file'.encode('utf8'),
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
223
            '1file-in-1topdir',
224
            '0dir-in-1topdir'
225
            ]
2321.1.2 by Robert Collins
Skip new tests that depend on unicode file paths.
226
        try:
227
            self.build_tree(paths)
228
        except UnicodeError:
229
            raise TestSkipped(
230
                'This platform does not support unicode file paths.')
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
231
        tree.add(paths, ids)
232
        tt = transform.TreeTransform(tree)
2408.1.3 by Alexander Belchenko
tree_implementations: make usage of symlinks optional
233
        if symlinks:
234
            root_transaction_id = tt.trans_id_tree_path('')
235
            tt.new_symlink('symlink',
236
                root_transaction_id, 'link-target', 'symlink')
1852.15.1 by Robert Collins
Add a complex test tree for use with Tree.walkdirs.
237
        tt.apply()
238
        return self.workingtree_to_test_tree(tree)
239
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
240
    def get_tree_with_utf8(self, tree):
241
        """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
242
        self._create_tree_with_utf8(tree)
243
        return self.workingtree_to_test_tree(tree)
244
245
    def _create_tree_with_utf8(self, tree):
246
        """Generate a tree with a utf8 revision and unicode paths."""
2294.1.3 by John Arbash Meinel
Make sure the inventory enrtries returned are properly formed.
247
        paths = [u'',
248
                 u'f\xf6',
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
249
                 u'b\xe5r/',
250
                 u'b\xe5r/b\xe1z',
251
                ]
252
        # bzr itself does not create unicode file ids, but we want them for
253
        # testing.
2309.4.10 by John Arbash Meinel
(fixed) Fix the last few tests that were explicitly passing around unicode ids
254
        file_ids = ['TREE_ROOT',
255
                    'f\xc3\xb6-id',
256
                    'b\xc3\xa5r-id',
257
                    'b\xc3\xa1z-id',
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
258
                   ]
259
        try:
2294.1.3 by John Arbash Meinel
Make sure the inventory enrtries returned are properly formed.
260
            self.build_tree(paths[1:])
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
261
        except UnicodeError:
262
            raise tests.TestSkipped('filesystem does not support unicode.')
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
263
        if tree.path2id('') is None:
264
            # Some trees do not have a root yet.
265
            tree.add(paths, file_ids)
266
        else:
267
            # Some trees will already have a root
268
            tree.set_root_id(file_ids[0])
269
            tree.add(paths[1:], file_ids[1:])
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
270
        try:
271
            tree.commit(u'in\xedtial', rev_id=u'r\xe9v-1'.encode('utf8'))
272
        except errors.NonAsciiRevisionId:
273
            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
274
275
    def get_tree_with_merged_utf8(self, tree):
276
        """Generate a tree with utf8 ancestors."""
277
        self._create_tree_with_utf8(tree)
278
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
279
        self.build_tree([u'tree2/b\xe5r/z\xf7z'])
2309.4.10 by John Arbash Meinel
(fixed) Fix the last few tests that were explicitly passing around unicode ids
280
        self.callDeprecated([osutils._file_id_warning],
281
                            tree2.add, [u'b\xe5r/z\xf7z'], [u'z\xf7z-id'])
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
282
        tree2.commit(u'to m\xe9rge', rev_id=u'r\xe9v-2'.encode('utf8'))
283
284
        tree.merge_from_branch(tree2.branch)
285
        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.
286
        return self.workingtree_to_test_tree(tree)
287
1852.6.1 by Robert Collins
Start tree implementation tests.
288
289
class TreeTestProviderAdapter(WorkingTreeTestProviderAdapter):
290
    """Generate test suites for each Tree implementation in bzrlib.
291
292
    Currently this covers all working tree formats, and RevisionTree by 
293
    committing a working tree to create the revision tree.
294
    """
295
296
    def adapt(self, test):
297
        result = super(TreeTestProviderAdapter, self).adapt(test)
298
        for adapted_test in result:
299
            # for working tree adapted tests, preserve the tree
300
            adapted_test.workingtree_to_test_tree = return_parameter
2255.2.164 by Martin Pool
Change the default format for some tests from AB1 back to WorkingTreeFormat3
301
        # this is the default in that it's used to test the generic InterTree
302
        # code.
303
        default_format = WorkingTreeFormat3()
1852.6.1 by Robert Collins
Start tree implementation tests.
304
        revision_tree_test = self._clone_test(
305
            test,
306
            default_format._matchingbzrdir, 
307
            default_format,
308
            RevisionTree.__name__)
309
        revision_tree_test.workingtree_to_test_tree = revision_tree_from_workingtree
310
        result.addTest(revision_tree_test)
2255.2.164 by Martin Pool
Change the default format for some tests from AB1 back to WorkingTreeFormat3
311
        # also explicity test WorkingTree4 against everything
2255.2.64 by John Arbash Meinel
Add the DirStateRevisionTree to the list of 'tree_implementations'
312
        dirstate_format = WorkingTreeFormat4()
313
        dirstate_revision_tree_test = self._clone_test(
314
            test,
315
            dirstate_format._matchingbzrdir,
316
            dirstate_format,
317
            DirStateRevisionTree.__name__)
318
        dirstate_revision_tree_test.workingtree_to_test_tree = _dirstate_tree_from_workingtree
319
        result.addTest(dirstate_revision_tree_test)
1852.6.1 by Robert Collins
Start tree implementation tests.
320
        return result
321
322
323
def test_suite():
324
    result = TestSuite()
325
    test_tree_implementations = [
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
326
        'bzrlib.tests.tree_implementations.test_get_file_mtime',
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
327
        'bzrlib.tests.tree_implementations.test_get_symlink_target',
2338.4.6 by Marien Zwart
Move some tests that do not need a working tree from workingtree_implementations to tree_implementations.
328
        'bzrlib.tests.tree_implementations.test_inv',
2255.2.71 by John Arbash Meinel
Add a test for list_files, and implement it for DirStateRevisionTree
329
        'bzrlib.tests.tree_implementations.test_list_files',
1908.11.5 by John Arbash Meinel
[merge] bzr.dev 2240
330
        'bzrlib.tests.tree_implementations.test_revision_tree',
1852.6.1 by Robert Collins
Start tree implementation tests.
331
        'bzrlib.tests.tree_implementations.test_test_trees',
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
332
        'bzrlib.tests.tree_implementations.test_tree',
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
333
        'bzrlib.tests.tree_implementations.test_walkdirs',
1852.6.1 by Robert Collins
Start tree implementation tests.
334
        ]
335
    adapter = TreeTestProviderAdapter(
336
        default_transport,
337
        # None here will cause a readonly decorator to be created
338
        # by the TestCaseWithTransport.get_readonly_transport method.
339
        None,
340
        [(format, format._matchingbzrdir) for format in 
341
         WorkingTreeFormat._formats.values() + _legacy_formats])
342
    loader = TestLoader()
343
    adapt_modules(test_tree_implementations, adapter, loader, result)
344
    result.addTests(loader.loadTestsFromModuleNames(['bzrlib.tests.tree_implementations']))
345
    return result