← 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
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/__init__.py
122
122
    default_tree_format = WorkingTreeFormat3()
123
123
    submod_tests = loader.loadTestsFromModuleNames([
124
124
        'bzrlib.tests.per_intertree.test_compare',
 
125
        'bzrlib.tests.per_intertree.test_file_content_matches',
125
126
        ])
126
127
    test_intertree_permutations = [
127
128
        # test InterTree with two default-format working trees.
134
135
            # -- vila 20090311
135
136
            chk_tree_format = WorkingTreeFormat4()
136
137
            chk_tree_format._get_matchingbzrdir = \
137
 
                lambda:bzrlib.bzrdir.format_registry.make_bzrdir('2a')
 
138
                lambda:bzrlib.controldir.format_registry.make_bzrdir('2a')
138
139
            test_intertree_permutations.append(
139
140
                (InterTree.__name__ + "(CHKInventory)",
140
141
                 InterTree,