← 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: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

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
    )
38
39
    TestCaseWithTree,
39
40
    )
40
41
from bzrlib.tree import InterTree
41
 
from bzrlib.workingtree_3 import WorkingTreeFormat3
 
42
from bzrlib.workingtree import (
 
43
    WorkingTreeFormat3,
 
44
    )
42
45
from bzrlib.workingtree_4 import WorkingTreeFormat4
43
46
 
44
47
 
122
125
    default_tree_format = WorkingTreeFormat3()
123
126
    submod_tests = loader.loadTestsFromModuleNames([
124
127
        'bzrlib.tests.per_intertree.test_compare',
125
 
        'bzrlib.tests.per_intertree.test_file_content_matches',
126
128
        ])
127
129
    test_intertree_permutations = [
128
130
        # test InterTree with two default-format working trees.
135
137
            # -- vila 20090311
136
138
            chk_tree_format = WorkingTreeFormat4()
137
139
            chk_tree_format._get_matchingbzrdir = \
138
 
                lambda:bzrlib.controldir.format_registry.make_bzrdir('2a')
 
140
                lambda:bzrlib.bzrdir.format_registry.make_bzrdir(
 
141
                    'development6-rich-root')
139
142
            test_intertree_permutations.append(
140
143
                (InterTree.__name__ + "(CHKInventory)",
141
144
                 InterTree,