/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 bzrlib/tests/tree_implementations/test_inv.py

  • Committer: Aaron Bentley
  • Date: 2008-04-12 19:43:13 UTC
  • mto: (3363.16.1 __contains__)
  • mto: This revision was merged to the branch mainline in revision 3387.
  • Revision ID: aaron@aaronbentley.com-20080412194313-qtygleydrwk8tfz7
Implement alterntative-to-inventory tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_inv.py
24
24
from bzrlib.mutabletree import MutableTree
25
25
from bzrlib.osutils import has_symlinks
26
26
from bzrlib.symbol_versioning import zero_ninetyone, one_zero
27
 
from bzrlib.tests import SymlinkFeature, TestSkipped
 
27
from bzrlib.tests import SymlinkFeature, TestSkipped, TestNotApplicable
28
28
from bzrlib.tests.tree_implementations import TestCaseWithTree
29
29
from bzrlib.uncommit import uncommit
30
30
 
31
31
 
 
32
def get_inventory_if_applicable(tree):
 
33
    try:
 
34
        return tree.inventory
 
35
    except NotImplementedError:
 
36
        raise TestNotApplicable('Tree does not implement inventory')
 
37
 
 
38
 
32
39
class TestEntryDiffing(TestCaseWithTree):
33
40
 
34
41
    def setUp(self):
55
62
        self.tree_2 = self.workingtree_to_test_tree(self.wt)
56
63
        self.tree_2.lock_read()
57
64
        self.addCleanup(self.tree_2.unlock)
58
 
        self.inv_2 = self.tree_2.inventory
 
65
        self.inv_2 = get_inventory_if_applicable(self.tree_2)
59
66
        self.file_2 = self.inv_2['fileid']
60
67
        self.file_2b = self.inv_2['binfileid']
61
68
        if has_symlinks():
182
189
        self.tree = self.workingtree_to_test_tree(self.wt)
183
190
        self.tree.lock_read()
184
191
        self.addCleanup(self.tree.unlock)
185
 
        self.file_active = self.tree.inventory['fileid']
 
192
        self.file_active = get_inventory_if_applicable(self.tree)['fileid']
186
193
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
187
194
            self.branch.repository.get_transaction())
188
195
        
228
235
        self.tree.lock_read()
229
236
        self.addCleanup(self.tree.unlock)
230
237
        # Commenting out the following line still fails.
231
 
        self.inv = self.tree.inventory
 
238
        self.inv = get_inventory_if_applicable(self.tree)
232
239
 
233
240
    def test_symlink_target(self):
234
241
        self.requireFeature(SymlinkFeature)