← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_intertree/__init__.py

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/__init__.py
24
24
 
25
25
import bzrlib
26
26
from bzrlib import (
 
27
    errors,
27
28
    revisiontree,
28
29
    tests,
29
30
    )
 
31
from bzrlib.transport import get_transport
30
32
from bzrlib.transform import TransformPreview
31
33
from bzrlib.tests import (
32
34
    default_transport,
38
40
    TestCaseWithTree,
39
41
    )
40
42
from bzrlib.tree import InterTree
41
 
from bzrlib.workingtree_3 import WorkingTreeFormat3
 
43
from bzrlib.workingtree import (
 
44
    WorkingTreeFormat3,
 
45
    )
42
46
from bzrlib.workingtree_4 import WorkingTreeFormat4
43
47
 
44
48
 
122
126
    default_tree_format = WorkingTreeFormat3()
123
127
    submod_tests = loader.loadTestsFromModuleNames([
124
128
        'bzrlib.tests.per_intertree.test_compare',
125
 
        'bzrlib.tests.per_intertree.test_file_content_matches',
126
129
        ])
127
130
    test_intertree_permutations = [
128
131
        # test InterTree with two default-format working trees.
135
138
            # -- vila 20090311
136
139
            chk_tree_format = WorkingTreeFormat4()
137
140
            chk_tree_format._get_matchingbzrdir = \
138
 
                lambda:bzrlib.bzrdir.format_registry.make_bzrdir('2a')
 
141
                lambda:bzrlib.bzrdir.format_registry.make_bzrdir(
 
142
                    'development6-rich-root')
139
143
            test_intertree_permutations.append(
140
144
                (InterTree.__name__ + "(CHKInventory)",
141
145
                 InterTree,