← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/interversionedfile_implementations/__init__.py
73
73
        """Generate the default list of interversionedfile permutations to test."""
74
74
        from bzrlib.versionedfile import InterVersionedFile
75
75
        from bzrlib.weave import WeaveFile
76
 
        from bzrlib.knit import KnitVersionedFile
 
76
        from bzrlib.knit import make_file_knit
77
77
        result = []
78
78
        # test the fallback InterVersionedFile from annotated knits to weave
79
79
        result.append((InterVersionedFile,
80
 
                       KnitVersionedFile,
 
80
                       make_file_knit,
81
81
                       WeaveFile))
82
82
        for optimiser in InterVersionedFile._optimisers:
83
83
            result.append((optimiser,