← 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: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

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