← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-01-11 04:33:12 UTC
  • mto: (5582.12.2 weave-plugin)
  • mto: This revision was merged to the branch mainline in revision 5718.
  • Revision ID: jelmer@samba.org-20110111043312-g4wx6iuf9662f36d
Move weave formats into bzrlib.plugins.weave_fmt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/__init__.py
28
28
    errors,
29
29
    tests,
30
30
    )
31
 
from bzrlib.branch import (BranchFormat,
32
 
                           _legacy_formats,
33
 
                           )
 
31
from bzrlib.branch import BranchFormat
34
32
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
35
33
from bzrlib.tests import test_server
36
34
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
131
129
    """ """
132
130
    # Generate a list of branch formats and their associated bzrdir formats to
133
131
    # use.
 
132
    from bzrlib.plugins.weave_fmt.branch import _legacy_formats as weave_formats
134
133
    combinations = [(format, format._matchingbzrdir) for format in
135
 
         BranchFormat.get_formats() + _legacy_formats]
 
134
         BranchFormat.get_formats() + weave_formats]
136
135
    scenarios = make_scenarios(
137
136
        # None here will cause the default vfs transport server to be used.
138
137
        None,