← 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

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/__init__.py
34
34
    default_transport,
35
35
    multiply_tests,
36
36
    )
37
 
from bzrlib.tests.tree_implementations import (
 
37
from bzrlib.tests.per_tree import (
38
38
    return_parameter,
39
39
    revision_tree_from_workingtree,
40
40
    TestCaseWithTree,
125
125
def load_tests(standard_tests, module, loader):
126
126
    default_tree_format = WorkingTreeFormat3()
127
127
    submod_tests = loader.loadTestsFromModuleNames([
128
 
        'bzrlib.tests.intertree_implementations.test_compare',
 
128
        'bzrlib.tests.per_intertree.test_compare',
129
129
        ])
130
130
    test_intertree_permutations = [
131
131
        # test InterTree with two default-format working trees.