← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/__init__.py
37
37
    BzrDirFormat,
38
38
    BzrDirMetaFormat1,
39
39
    )
40
 
from bzrlib.errors import (
41
 
    FileExists,
42
 
    NotBranchError,
43
 
    UninitializableFormat,
44
 
    )
45
40
from bzrlib.tests import (
46
41
    TestCaseWithTransport,
47
42
    multiply_tests,
86
81
class TestCaseWithInterBranch(TestCaseWithTransport):
87
82
 
88
83
    def make_from_branch(self, relpath):
89
 
        repo = self.make_repository(relpath)
 
84
        repo = self.make_repository(relpath, format=self.branch_format_from._matchingbzrdir)
90
85
        return self.branch_format_from.initialize(repo.bzrdir)
91
86
 
92
87
    def make_from_branch_and_memory_tree(self, relpath):
109
104
            format=format)
110
105
 
111
106
    def make_to_branch(self, relpath):
112
 
        repo = self.make_repository(relpath)
 
107
        repo = self.make_repository(relpath, format=self.branch_format_to._matchingbzrdir)
113
108
        return self.branch_format_to.initialize(repo.bzrdir)
114
109
 
115
110
    def make_to_branch_and_memory_tree(self, relpath):
171
166
 
172
167
def load_tests(standard_tests, module, loader):
173
168
    submod_tests = loader.loadTestsFromModuleNames([
 
169
        'bzrlib.tests.per_interbranch.test_fetch',
174
170
        'bzrlib.tests.per_interbranch.test_get',
175
171
        'bzrlib.tests.per_interbranch.test_copy_content_into',
176
172
        'bzrlib.tests.per_interbranch.test_pull',