← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-11 09:27:55 UTC
  • mfrom: (5017.3.46 test-servers)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092755-3vvu4vbwiwjjte3s
Move tests servers from bzrlib.transport to bzrlib.tests.test_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
54
54
    )
55
55
from bzrlib.branch import Branch
56
56
from bzrlib.conflicts import ConflictList
 
57
from bzrlib.transport import memory
57
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
58
59
from bzrlib.smtp_connection import SMTPConnection
59
60
from bzrlib.workingtree import WorkingTree
3444
3445
            from bzrlib.tests import stub_sftp
3445
3446
            return stub_sftp.SFTPAbsoluteServer
3446
3447
        if typestring == "memory":
3447
 
            from bzrlib.transport.memory import MemoryServer
3448
 
            return MemoryServer
 
3448
            from bzrlib.tests import test_server
 
3449
            return memory.MemoryServer
3449
3450
        if typestring == "fakenfs":
3450
 
            from bzrlib.transport.fakenfs import FakeNFSServer
3451
 
            return FakeNFSServer
 
3451
            from bzrlib.tests import test_server
 
3452
            return test_server.FakeNFSServer
3452
3453
        msg = "No known transport type %s. Supported types are: sftp\n" %\
3453
3454
            (typestring)
3454
3455
        raise errors.BzrCommandError(msg)