← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.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_controldir/test_controldir.py
44
44
    CannedInputUIFactory,
45
45
    )
46
46
from bzrlib.remote import RemoteBzrDir, RemoteRepository
47
 
from bzrlib.repofmt import weaverepo
48
47
 
49
48
 
50
49
class TestControlDir(TestCaseWithControlDir):
1207
1206
                                   transport.Transport))
1208
1207
        # with a given format, either the bzr dir supports identifiable
1209
1208
        # repositories, or it supports anonymous  repository formats, but not both.
1210
 
        anonymous_format = weaverepo.RepositoryFormat6()
1211
 
        identifiable_format = weaverepo.RepositoryFormat7()
 
1209
        from bzrlib.plugins.weave_fmt.repository import (
 
1210
            RepositoryFormat6, RepositoryFormat7)
 
1211
        anonymous_format = RepositoryFormat6()
 
1212
        identifiable_format = RepositoryFormat7()
1212
1213
        try:
1213
1214
            found_transport = dir.get_repository_transport(anonymous_format)
1214
1215
            self.assertRaises(errors.IncompatibleFormat,