~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

track down a couple other places where we are using list_files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
# Authors:  Robert Collins <robert.collins@canonical.com>
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
from cStringIO import StringIO
 
19
import os
 
20
 
 
21
from bzrlib import dirstate, ignores
 
22
import bzrlib
 
23
from bzrlib.branch import Branch
 
24
from bzrlib import bzrdir, conflicts, errors, workingtree
 
25
from bzrlib.bzrdir import BzrDir
 
26
from bzrlib.errors import NotBranchError, NotVersionedError
 
27
from bzrlib.lockdir import LockDir
 
28
from bzrlib.mutabletree import needs_tree_write_lock
 
29
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
 
30
from bzrlib.symbol_versioning import zero_thirteen
 
31
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
 
32
from bzrlib.trace import mutter
 
33
from bzrlib.transport import get_transport
 
34
from bzrlib.workingtree import (
 
35
    TreeEntry,
 
36
    TreeDirectory,
 
37
    TreeFile,
 
38
    TreeLink,
 
39
    WorkingTree,
 
40
    )
 
41
 
 
42
class TestTreeDirectory(TestCaseWithTransport):
 
43
 
 
44
    def test_kind_character(self):
 
45
        self.assertEqual(TreeDirectory().kind_character(), '/')
 
46
 
 
47
 
 
48
class TestTreeEntry(TestCaseWithTransport):
 
49
 
 
50
    def test_kind_character(self):
 
51
        self.assertEqual(TreeEntry().kind_character(), '???')
 
52
 
 
53
 
 
54
class TestTreeFile(TestCaseWithTransport):
 
55
 
 
56
    def test_kind_character(self):
 
57
        self.assertEqual(TreeFile().kind_character(), '')
 
58
 
 
59
 
 
60
class TestTreeLink(TestCaseWithTransport):
 
61
 
 
62
    def test_kind_character(self):
 
63
        self.assertEqual(TreeLink().kind_character(), '')
 
64
 
 
65
 
 
66
class TestDefaultFormat(TestCaseWithTransport):
 
67
 
 
68
    def test_get_set_default_format(self):
 
69
        old_format = workingtree.WorkingTreeFormat.get_default_format()
 
70
        # default is 3
 
71
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
 
72
        workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
 
73
        try:
 
74
            # the default branch format is used by the meta dir format
 
75
            # which is not the default bzrdir format at this point
 
76
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
77
            dir.create_repository()
 
78
            dir.create_branch()
 
79
            result = dir.create_workingtree()
 
80
            self.assertEqual(result, 'A tree')
 
81
        finally:
 
82
            workingtree.WorkingTreeFormat.set_default_format(old_format)
 
83
        self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
 
84
 
 
85
 
 
86
class SampleTreeFormat(workingtree.WorkingTreeFormat):
 
87
    """A sample format
 
88
 
 
89
    this format is initializable, unsupported to aid in testing the 
 
90
    open and open_downlevel routines.
 
91
    """
 
92
 
 
93
    def get_format_string(self):
 
94
        """See WorkingTreeFormat.get_format_string()."""
 
95
        return "Sample tree format."
 
96
 
 
97
    def initialize(self, a_bzrdir, revision_id=None):
 
98
        """Sample branches cannot be created."""
 
99
        t = a_bzrdir.get_workingtree_transport(self)
 
100
        t.put_bytes('format', self.get_format_string())
 
101
        return 'A tree'
 
102
 
 
103
    def is_supported(self):
 
104
        return False
 
105
 
 
106
    def open(self, transport, _found=False):
 
107
        return "opened tree."
 
108
 
 
109
 
 
110
class TestWorkingTreeFormat(TestCaseWithTransport):
 
111
    """Tests for the WorkingTreeFormat facility."""
 
112
 
 
113
    def test_find_format(self):
 
114
        # is the right format object found for a working tree?
 
115
        # create a branch with a few known format objects.
 
116
        self.build_tree(["foo/", "bar/"])
 
117
        def check_format(format, url):
 
118
            dir = format._matchingbzrdir.initialize(url)
 
119
            dir.create_repository()
 
120
            dir.create_branch()
 
121
            format.initialize(dir)
 
122
            t = get_transport(url)
 
123
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
 
124
            self.failUnless(isinstance(found_format, format.__class__))
 
125
        check_format(workingtree.WorkingTreeFormat3(), "bar")
 
126
        
 
127
    def test_find_format_no_tree(self):
 
128
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
129
        self.assertRaises(errors.NoWorkingTree,
 
130
                          workingtree.WorkingTreeFormat.find_format,
 
131
                          dir)
 
132
 
 
133
    def test_find_format_unknown_format(self):
 
134
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
135
        dir.create_repository()
 
136
        dir.create_branch()
 
137
        SampleTreeFormat().initialize(dir)
 
138
        self.assertRaises(errors.UnknownFormatError,
 
139
                          workingtree.WorkingTreeFormat.find_format,
 
140
                          dir)
 
141
 
 
142
    def test_register_unregister_format(self):
 
143
        format = SampleTreeFormat()
 
144
        # make a control dir
 
145
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
 
146
        dir.create_repository()
 
147
        dir.create_branch()
 
148
        # make a branch
 
149
        format.initialize(dir)
 
150
        # register a format for it.
 
151
        workingtree.WorkingTreeFormat.register_format(format)
 
152
        # which branch.Open will refuse (not supported)
 
153
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
 
154
        # but open_downlevel will work
 
155
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
 
156
        # unregister the format
 
157
        workingtree.WorkingTreeFormat.unregister_format(format)
 
158
 
 
159
 
 
160
class TestWorkingTreeFormat3(TestCaseWithTransport):
 
161
    """Tests specific to WorkingTreeFormat3."""
 
162
 
 
163
    def test_disk_layout(self):
 
164
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
165
        control.create_repository()
 
166
        control.create_branch()
 
167
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
168
        # we want:
 
169
        # format 'Bazaar-NG Working Tree format 3'
 
170
        # inventory = blank inventory
 
171
        # pending-merges = ''
 
172
        # stat-cache = ??
 
173
        # no inventory.basis yet
 
174
        t = control.get_workingtree_transport(None)
 
175
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
 
176
                             t.get('format').read())
 
177
        # self.assertContainsRe(t.get('inventory').read(), 
 
178
        #                       '<inventory file_id="[^"]*" format="5">\n'
 
179
        #                       '</inventory>\n',
 
180
        #                      )
 
181
        # WorkingTreeFormat3 doesn't default to creating a unique root id,
 
182
        # because it is incompatible with older bzr versions
 
183
        self.assertContainsRe(t.get('inventory').read(),
 
184
                              '<inventory format="5">\n'
 
185
                              '</inventory>\n',
 
186
                             )
 
187
        self.assertEqualDiff('### bzr hashcache v5\n',
 
188
                             t.get('stat-cache').read())
 
189
        self.assertFalse(t.has('inventory.basis'))
 
190
        # no last-revision file means 'None' or 'NULLREVISION'
 
191
        self.assertFalse(t.has('last-revision'))
 
192
        # TODO RBC 20060210 do a commit, check the inventory.basis is created 
 
193
        # correctly and last-revision file becomes present.
 
194
 
 
195
    def test_uses_lockdir(self):
 
196
        """WorkingTreeFormat3 uses its own LockDir:
 
197
            
 
198
            - lock is a directory
 
199
            - when the WorkingTree is locked, LockDir can see that
 
200
        """
 
201
        t = self.get_transport()
 
202
        url = self.get_url()
 
203
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
 
204
        repo = dir.create_repository()
 
205
        branch = dir.create_branch()
 
206
        try:
 
207
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
 
208
        except errors.NotLocalUrl:
 
209
            raise TestSkipped('Not a local URL')
 
210
        self.assertIsDirectory('.bzr', t)
 
211
        self.assertIsDirectory('.bzr/checkout', t)
 
212
        self.assertIsDirectory('.bzr/checkout/lock', t)
 
213
        our_lock = LockDir(t, '.bzr/checkout/lock')
 
214
        self.assertEquals(our_lock.peek(), None)
 
215
        tree.lock_write()
 
216
        self.assertTrue(our_lock.peek())
 
217
        tree.unlock()
 
218
        self.assertEquals(our_lock.peek(), None)
 
219
 
 
220
    def test_missing_pending_merges(self):
 
221
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
222
        control.create_repository()
 
223
        control.create_branch()
 
224
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
225
        tree._control_files._transport.delete("pending-merges")
 
226
        self.assertEqual([], tree.get_parent_ids())
 
227
 
 
228
 
 
229
class TestWorkingTreeFormat4(TestCaseWithTransport):
 
230
    """Tests specific to WorkingTreeFormat4."""
 
231
 
 
232
    def test_disk_layout(self):
 
233
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
234
        control.create_repository()
 
235
        control.create_branch()
 
236
        tree = workingtree.WorkingTreeFormat4().initialize(control)
 
237
        # we want:
 
238
        # format 'Bazaar Working Tree format 4'
 
239
        # stat-cache = ??
 
240
        t = control.get_workingtree_transport(None)
 
241
        self.assertEqualDiff('Bazaar Working Tree format 4\n',
 
242
                             t.get('format').read())
 
243
        self.assertEqualDiff('### bzr hashcache v5\n',
 
244
                             t.get('stat-cache').read())
 
245
        self.assertFalse(t.has('inventory.basis'))
 
246
        # no last-revision file means 'None' or 'NULLREVISION'
 
247
        self.assertFalse(t.has('last-revision'))
 
248
        # TODO RBC 20060210 do a commit, check the inventory.basis is created 
 
249
        # correctly and last-revision file becomes present.
 
250
        # manually make a dirstate toc check the format is as desired.
 
251
        state = dirstate.DirState.on_file(t.local_abspath('dirstate'))
 
252
        self.assertEqual([], state.get_parent_ids())
 
253
 
 
254
    def test_uses_lockdir(self):
 
255
        """WorkingTreeFormat4 uses its own LockDir:
 
256
            
 
257
            - lock is a directory
 
258
            - when the WorkingTree is locked, LockDir can see that
 
259
        """
 
260
        # this test could be factored into a subclass of tests common to both
 
261
        # format 3 and 4, but for now its not much of an issue as there is only one in common.
 
262
        t = self.get_transport()
 
263
        tree = self.make_workingtree()
 
264
        self.assertIsDirectory('.bzr', t)
 
265
        self.assertIsDirectory('.bzr/checkout', t)
 
266
        self.assertIsDirectory('.bzr/checkout/lock', t)
 
267
        our_lock = LockDir(t, '.bzr/checkout/lock')
 
268
        self.assertEquals(our_lock.peek(), None)
 
269
        tree.lock_write()
 
270
        self.assertTrue(our_lock.peek())
 
271
        tree.unlock()
 
272
        self.assertEquals(our_lock.peek(), None)
 
273
 
 
274
    def make_workingtree(self):
 
275
        url = self.get_url()
 
276
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
 
277
        repo = dir.create_repository()
 
278
        branch = dir.create_branch()
 
279
        try:
 
280
            return workingtree.WorkingTreeFormat4().initialize(dir)
 
281
        except errors.NotLocalUrl:
 
282
            raise TestSkipped('Not a local URL')
 
283
 
 
284
    # TODO: test that dirstate also stores & retrieves the parent list of 
 
285
    # workingtree-parent revisions, including when they have multiple parents.
 
286
    # (in other words, the case when we're constructing a merge of 
 
287
    # revisions which are themselves merges.)
 
288
 
 
289
    # The simplest case is that the the workingtree's primary 
 
290
    # parent tree can be retrieved.  This is required for all WorkingTrees, 
 
291
    # and covered by the generic tests.
 
292
 
 
293
    def test_dirstate_stores_all_parent_inventories(self):
 
294
        tree = self.make_workingtree()
 
295
 
 
296
        # We're going to build in tree a working tree 
 
297
        # with three parent trees, with some files in common.  
 
298
    
 
299
        # We really don't want to do commit or merge in the new dirstate-based
 
300
        # tree, because that might not work yet.  So instead we build
 
301
        # revisions elsewhere and pull them across, doing by hand part of the
 
302
        # work that merge would do.
 
303
 
 
304
        subtree = self.make_branch_and_tree('subdir')
 
305
        self.build_tree(['subdir/file-a',])
 
306
        subtree.add(['file-a'], ['id-a'])
 
307
        rev1 = subtree.commit('commit in subdir')
 
308
        rev1_tree = subtree.basis_tree()
 
309
 
 
310
        subtree2 = subtree.bzrdir.sprout('subdir2').open_workingtree()
 
311
        self.build_tree(['subdir2/file-b'])
 
312
        subtree2.add(['file-b'], ['id-b'])
 
313
        rev2 = subtree2.commit('commit in subdir2')
 
314
        rev2_tree = subtree2.basis_tree()
 
315
 
 
316
        subtree.merge_from_branch(subtree2.branch)
 
317
        rev3 = subtree.commit('merge from subdir2')
 
318
        rev3_tree = subtree.basis_tree()
 
319
 
 
320
        repo = tree.branch.repository
 
321
        repo.fetch(subtree.branch.repository, rev3)
 
322
        # will also pull the others...
 
323
 
 
324
        # tree doesn't contain a text merge yet but we'll just
 
325
        # set the parents as if a merge had taken place. 
 
326
        # this should cause the tree data to be folded into the 
 
327
        # dirstate.
 
328
        tree.set_parent_trees([
 
329
            (rev1, rev1_tree),
 
330
            (rev2, rev2_tree),
 
331
            (rev3, rev3_tree), ])
 
332
 
 
333
        # now we should be able to get them back out
 
334
        self.assertTreesEqual(tree.revision_tree(rev1), rev1_tree)
 
335
        self.assertTreesEqual(tree.revision_tree(rev2), rev2_tree)
 
336
        self.assertTreesEqual(tree.revision_tree(rev3), rev3_tree)
 
337
 
 
338
    def test_dirstate_doesnt_read_parents_from_repo_when_setting(self):
 
339
        """Setting parent trees on a dirstate working tree takes
 
340
        the trees it's given and doesn't need to read them from the 
 
341
        repository.
 
342
        """
 
343
        tree = self.make_workingtree()
 
344
 
 
345
        subtree = self.make_branch_and_tree('subdir')
 
346
        rev1 = subtree.commit('commit in subdir')
 
347
        rev1_tree = subtree.basis_tree()
 
348
 
 
349
        tree.branch.pull(subtree.branch)
 
350
 
 
351
        # break the repository's legs to make sure it only uses the trees
 
352
        # it's given; any calls to forbidden methods will raise an 
 
353
        # AssertionError
 
354
        repo = tree.branch.repository
 
355
        repo.get_revision = self.fail
 
356
        repo.get_inventory = self.fail
 
357
        repo.get_inventory_xml = self.fail
 
358
        # try to set the parent trees.
 
359
        tree.set_parent_trees([(rev1, rev1_tree)])
 
360
 
 
361
    def test_dirstate_doesnt_read_from_repo_when_returning_cache_tree(self):
 
362
        """Getting parent trees from a dirstate tree does not read from the 
 
363
        repos inventory store. This is an important part of the dirstate
 
364
        performance optimisation work.
 
365
        """
 
366
        tree = self.make_workingtree()
 
367
 
 
368
        subtree = self.make_branch_and_tree('subdir')
 
369
        rev1 = subtree.commit('commit in subdir')
 
370
        rev1_tree = subtree.basis_tree()
 
371
        rev2 = subtree.commit('second commit in subdir', allow_pointless=True)
 
372
        rev2_tree = subtree.basis_tree()
 
373
 
 
374
        tree.branch.pull(subtree.branch)
 
375
 
 
376
        # break the repository's legs to make sure it only uses the trees
 
377
        # it's given; any calls to forbidden methods will raise an 
 
378
        # AssertionError
 
379
        repo = tree.branch.repository
 
380
        # dont uncomment this: the revision object must be accessed to 
 
381
        # answer 'get_parent_ids' for the revision tree- dirstate does not 
 
382
        # cache the parents of a parent tree at this point.
 
383
        #repo.get_revision = self.fail
 
384
        repo.get_inventory = self.fail
 
385
        repo.get_inventory_xml = self.fail
 
386
        # set the parent trees.
 
387
        tree.set_parent_trees([(rev1, rev1_tree), (rev2, rev2_tree)])
 
388
        # read the first tree
 
389
        result_rev1_tree = tree.revision_tree(rev1)
 
390
        # read the second
 
391
        result_rev2_tree = tree.revision_tree(rev2)
 
392
        # compare - there should be no differences between the handed and 
 
393
        # returned trees
 
394
        self.assertTreesEqual(rev1_tree, result_rev1_tree)
 
395
        self.assertTreesEqual(rev2_tree, result_rev2_tree)
 
396
 
 
397
    def test_dirstate_doesnt_cache_non_parent_trees(self):
 
398
        """Getting parent trees from a dirstate tree does not read from the 
 
399
        repos inventory store. This is an important part of the dirstate
 
400
        performance optimisation work.
 
401
        """
 
402
        tree = self.make_workingtree()
 
403
 
 
404
        # make a tree that we can try for, which is able to be returned but
 
405
        # must not be
 
406
        subtree = self.make_branch_and_tree('subdir')
 
407
        rev1 = subtree.commit('commit in subdir')
 
408
        tree.branch.pull(subtree.branch)
 
409
        # check it fails
 
410
        self.assertRaises(errors.NoSuchRevision, tree.revision_tree, rev1)
 
411
 
 
412
    def test_no_dirstate_outside_lock(self):
 
413
        # temporary test until the code is mature enough to test from outside.
 
414
        """Getting a dirstate object fails if there is no lock."""
 
415
        def lock_and_call_current_dirstate(tree, lock_method):
 
416
            getattr(tree, lock_method)()
 
417
            tree.current_dirstate()
 
418
            tree.unlock()
 
419
        tree = self.make_workingtree()
 
420
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
 
421
        lock_and_call_current_dirstate(tree, 'lock_read')
 
422
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
 
423
        lock_and_call_current_dirstate(tree, 'lock_write')
 
424
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
 
425
        lock_and_call_current_dirstate(tree, 'lock_tree_write')
 
426
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
 
427
 
 
428
    def test_new_dirstate_on_new_lock(self):
 
429
        # until we have detection for when a dirstate can be reused, we
 
430
        # want to reparse dirstate on every new lock.
 
431
        known_dirstates = set()
 
432
        def lock_and_compare_all_current_dirstate(tree, lock_method):
 
433
            getattr(tree, lock_method)()
 
434
            state = tree.current_dirstate()
 
435
            self.assertFalse(state in known_dirstates)
 
436
            known_dirstates.add(state)
 
437
            tree.unlock()
 
438
        tree = self.make_workingtree()
 
439
        # lock twice with each type to prevent silly per-lock-type bugs.
 
440
        # each lock and compare looks for a unique state object.
 
441
        lock_and_compare_all_current_dirstate(tree, 'lock_read')
 
442
        lock_and_compare_all_current_dirstate(tree, 'lock_read')
 
443
        lock_and_compare_all_current_dirstate(tree, 'lock_tree_write')
 
444
        lock_and_compare_all_current_dirstate(tree, 'lock_tree_write')
 
445
        lock_and_compare_all_current_dirstate(tree, 'lock_write')
 
446
        lock_and_compare_all_current_dirstate(tree, 'lock_write')
 
447
 
 
448
 
 
449
class TestFormat2WorkingTree(TestCaseWithTransport):
 
450
    """Tests that are specific to format 2 trees."""
 
451
 
 
452
    def create_format2_tree(self, url):
 
453
        return self.make_branch_and_tree(
 
454
            url, format=bzrlib.bzrdir.BzrDirFormat6())
 
455
 
 
456
    def test_conflicts(self):
 
457
        # test backwards compatability
 
458
        tree = self.create_format2_tree('.')
 
459
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
 
460
                          None)
 
461
        file('lala.BASE', 'wb').write('labase')
 
462
        expected = conflicts.ContentsConflict('lala')
 
463
        self.assertEqual(list(tree.conflicts()), [expected])
 
464
        file('lala', 'wb').write('la')
 
465
        tree.add('lala', 'lala-id')
 
466
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
 
467
        self.assertEqual(list(tree.conflicts()), [expected])
 
468
        file('lala.THIS', 'wb').write('lathis')
 
469
        file('lala.OTHER', 'wb').write('laother')
 
470
        # When "text conflict"s happen, stem, THIS and OTHER are text
 
471
        expected = conflicts.TextConflict('lala', file_id='lala-id')
 
472
        self.assertEqual(list(tree.conflicts()), [expected])
 
473
        os.unlink('lala.OTHER')
 
474
        os.mkdir('lala.OTHER')
 
475
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
 
476
        self.assertEqual(list(tree.conflicts()), [expected])
 
477
 
 
478
 
 
479
class TestNonFormatSpecificCode(TestCaseWithTransport):
 
480
    """This class contains tests of workingtree that are not format specific."""
 
481
 
 
482
    def test_gen_file_id(self):
 
483
        file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_file_id,
 
484
                                      'filename')
 
485
        self.assertStartsWith(file_id, 'filename-')
 
486
 
 
487
    def test_gen_root_id(self):
 
488
        file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_root_id)
 
489
        self.assertStartsWith(file_id, 'tree_root-')
 
490
        
 
491
 
 
492
class InstrumentedTree(object):
 
493
    """A instrumented tree to check the needs_tree_write_lock decorator."""
 
494
 
 
495
    def __init__(self):
 
496
        self._locks = []
 
497
 
 
498
    def lock_tree_write(self):
 
499
        self._locks.append('t')
 
500
 
 
501
    @needs_tree_write_lock
 
502
    def method_with_tree_write_lock(self, *args, **kwargs):
 
503
        """A lock_tree_write decorated method that returns its arguments."""
 
504
        return args, kwargs
 
505
 
 
506
    @needs_tree_write_lock
 
507
    def method_that_raises(self):
 
508
        """This method causes an exception when called with parameters.
 
509
        
 
510
        This allows the decorator code to be checked - it should still call
 
511
        unlock.
 
512
        """
 
513
 
 
514
    def unlock(self):
 
515
        self._locks.append('u')
 
516
 
 
517
 
 
518
class TestInstrumentedTree(TestCase):
 
519
 
 
520
    def test_needs_tree_write_lock(self):
 
521
        """@needs_tree_write_lock should be semantically transparent."""
 
522
        tree = InstrumentedTree()
 
523
        self.assertEqual(
 
524
            'method_with_tree_write_lock',
 
525
            tree.method_with_tree_write_lock.__name__)
 
526
        self.assertEqual(
 
527
            "A lock_tree_write decorated method that returns its arguments.",
 
528
            tree.method_with_tree_write_lock.__doc__)
 
529
        args = (1, 2, 3)
 
530
        kwargs = {'a':'b'}
 
531
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
 
532
        self.assertEqual((args, kwargs), result)
 
533
        self.assertEqual(['t', 'u'], tree._locks)
 
534
        self.assertRaises(TypeError, tree.method_that_raises, 'foo')
 
535
        self.assertEqual(['t', 'u', 't', 'u'], tree._locks)