← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/test_inv.py

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_inv.py
23
23
from bzrlib import (
24
24
    tests,
25
25
    )
26
 
from bzrlib.tests import tree_implementations
 
26
from bzrlib.tests import per_tree
27
27
from bzrlib.mutabletree import MutableTree
28
28
from bzrlib.tests import SymlinkFeature, TestSkipped
29
29
from bzrlib.transform import _PreviewTree
34
34
    return tree.iter_entries_by_dir([file_id]).next()[1]
35
35
 
36
36
 
37
 
class TestPreviousHeads(tree_implementations.TestCaseWithTree):
 
37
class TestPreviousHeads(per_tree.TestCaseWithTree):
38
38
 
39
39
    def setUp(self):
40
40
        # we want several inventories, that respectively
69
69
    # TODO: test two inventories with the same file revision
70
70
 
71
71
 
72
 
class TestInventoryWithSymlinks(tree_implementations.TestCaseWithTree):
 
72
class TestInventoryWithSymlinks(per_tree.TestCaseWithTree):
73
73
 
74
74
    _test_needs_features = [tests.SymlinkFeature]
75
75
 
76
76
    def setUp(self):
77
 
        tree_implementations.TestCaseWithTree.setUp(self)
 
77
        per_tree.TestCaseWithTree.setUp(self)
78
78
        self.tree = self.get_tree_with_subdirs_and_all_content_types()
79
79
        self.tree.lock_read()
80
80
        self.addCleanup(self.tree.unlock)
101
101
        self.assertEqual(None, entry.text_size)
102
102
 
103
103
 
104
 
class TestInventory(tree_implementations.TestCaseWithTree):
 
104
class TestInventory(per_tree.TestCaseWithTree):
105
105
 
106
106
    def test_paths2ids_recursive(self):
107
107
        work_tree = self.make_branch_and_tree('tree')